summaryrefslogtreecommitdiffstats
path: root/client/lib
diff options
context:
space:
mode:
authorLiming Xie <liming.xie@gmail.com>2015-12-17 14:23:35 +0800
committerLiming Xie <liming.xie@gmail.com>2015-12-17 14:23:35 +0800
commit354eff9f7bf550f83d55ef2e96b10aab1a70162d (patch)
tree34cba5531d56d4ca51ed5346a5f26e480c4a33c7 /client/lib
parent0954cff5b470712210275a9c0699d85d6579ab54 (diff)
downloadwekan-354eff9f7bf550f83d55ef2e96b10aab1a70162d.tar.gz
wekan-354eff9f7bf550f83d55ef2e96b10aab1a70162d.tar.bz2
wekan-354eff9f7bf550f83d55ef2e96b10aab1a70162d.zip
add: support compact mode for mobile web, auto adapt to small screen/window
Diffstat (limited to 'client/lib')
-rw-r--r--client/lib/popup.js16
-rw-r--r--client/lib/utils.js17
2 files changed, 24 insertions, 9 deletions
diff --git a/client/lib/popup.js b/client/lib/popup.js
index 7418d938..797eb26d 100644
--- a/client/lib/popup.js
+++ b/client/lib/popup.js
@@ -1,10 +1,3 @@
-// A simple tracker dependency that we invalidate every time the window is
-// resized. This is used to reactively re-calculate the popup position in case
-// of a window resize. This is the equivalent of a "Signal" in some other
-// programming environments (eg, elm).
-const windowResizeDep = new Tracker.Dependency();
-$(window).on('resize', () => windowResizeDep.changed());
-
window.Popup = new class {
constructor() {
// The template we use to render popups
@@ -160,7 +153,10 @@ window.Popup = new class {
_getOffset(element) {
const $element = $(element);
return () => {
- windowResizeDep.depend();
+ Utils.windowResizeDep.depend();
+
+ if(Utils.isMiniScreen()) return { left:0, top:0 };
+
const offset = $element.offset();
const popupWidth = 300 + 15;
return {
@@ -183,7 +179,9 @@ window.Popup = new class {
// was available and returns `false`. There is a (small) risk a false
// positives.
const title = TAPi18n.__(translationKey);
- return title !== translationKey ? title : false;
+ // when popup showed as full of small screen, we need a default header to clearly see [X] button
+ const defaultTitle = Utils.isMiniScreen() ? 'Wekan' : false;
+ return title !== translationKey ? title : defaultTitle;
};
}
};
diff --git a/client/lib/utils.js b/client/lib/utils.js
index 6bdd5822..4f772a60 100644
--- a/client/lib/utils.js
+++ b/client/lib/utils.js
@@ -22,6 +22,17 @@ Utils = {
return string.charAt(0).toUpperCase() + string.slice(1);
},
+ windowResizeDep: new Tracker.Dependency(),
+
+ // in fact, what we really care is screen size
+ // large mobile device like iPad or android Pad has a big screen, it should also behave like a desktop
+ // in a small window (even on desktop), Wekan run in compact mode.
+ // we can easily debug with a small window of desktop broswer. :-)
+ isMiniScreen() {
+ this.windowResizeDep.depend();
+ return $(window).width() <= 800;
+ },
+
// Determine the new sort index
calculateIndex(prevCardDomElement, nextCardDomElement, nCards = 1) {
let base, increment;
@@ -54,3 +65,9 @@ Utils = {
};
},
};
+
+// A simple tracker dependency that we invalidate every time the window is
+// resized. This is used to reactively re-calculate the popup position in case
+// of a window resize. This is the equivalent of a "Signal" in some other
+// programming environments (eg, elm).
+$(window).on('resize', () => Utils.windowResizeDep.changed());