Skip to content

Commit

Permalink
Merge pull request #2167 from shinyichen/sidebar
Browse files Browse the repository at this point in the history
  • Loading branch information
thostetler committed May 22, 2021
2 parents 9f4c445 + 2409501 commit e2083a8
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/js/mixins/side_bar_manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ define(['backbone', 'js/components/api_feedback'], function(
.getObject('User')
.getUserData();
if (!ud) return false;
return /show/i.test(ud.defaultHideSidebars);
return !ud.defaultHideSidebars
? false
: /show/i.test(ud.defaultHideSidebars);
} catch (e) {
return false;
}
Expand Down Expand Up @@ -66,8 +68,12 @@ define(['backbone', 'js/components/api_feedback'], function(
*/
_onUserAnnouncement: function(ev, changed) {
// only update if the changed key was defaultHideSidebars
if (_.contains('defaultHideSidebars', _.keys(changed))) {
this.setSidebarState(this._getUpdateFromUserData());
if (_.contains(_.keys(changed), 'defaultHideSidebars')) {
this.setSidebarState(
!changed.defaultHideSidebars
? true
: /show/i.test(changed.defaultHideSidebars)
);
}
},

Expand Down

0 comments on commit e2083a8

Please sign in to comment.