summaryrefslogtreecommitdiffstats
path: root/client/components/sidebar/sidebar.js
diff options
context:
space:
mode:
authorXavier Priour <xavier.priour@bubblyware.com>2015-12-17 11:59:26 +0100
committerXavier Priour <xavier.priour@bubblyware.com>2015-12-17 11:59:26 +0100
commit43b1c4b576b8f0e4c342ec19684000a06809a253 (patch)
treec92938735d6ad7635b2cb9739c2b509829dbbf84 /client/components/sidebar/sidebar.js
parent4cea6fca908b4f9acd8687293041ebee86284883 (diff)
parentce88495d4783d2352bdc277a69496d90c38495ce (diff)
downloadwekan-43b1c4b576b8f0e4c342ec19684000a06809a253.tar.gz
wekan-43b1c4b576b8f0e4c342ec19684000a06809a253.tar.bz2
wekan-43b1c4b576b8f0e4c342ec19684000a06809a253.zip
Merge remote-tracking branch 'upstream/devel' into devel
Diffstat (limited to 'client/components/sidebar/sidebar.js')
-rw-r--r--client/components/sidebar/sidebar.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js
index ec3ebcf6..4bb53d4d 100644
--- a/client/components/sidebar/sidebar.js
+++ b/client/components/sidebar/sidebar.js
@@ -18,7 +18,8 @@ BlazeComponent.extendComponent({
},
onCreated() {
- this._isOpen = new ReactiveVar(!Session.get('currentCard'));
+ const initOpen = Utils.isMiniScreen() ? false : (!Session.get('currentCard'));
+ this._isOpen = new ReactiveVar(initOpen);
this._view = new ReactiveVar(defaultView);
Sidebar = this;
},
@@ -96,6 +97,7 @@ BlazeComponent.extendComponent({
// XXX Hacky, we need some kind of `super`
const mixinEvents = this.getMixin(Mixins.InfiniteScrolling).events();
return [...mixinEvents, {
+ 'click .js-hide-sidebar': this.hide,
'click .js-toggle-sidebar': this.toggle,
'click .js-back-home': this.setView,
}];