# HG changeset patch # User Ludovic Chabant # Date 1442728855 25200 # Node ID 71181f1f824ddfcc27ffcb603f72970b671b259b # Parent 1df31795fcab3fdea38f9c0e1d70e9dc83853198 Menu now correctly adds margin to the rest of the page. diff -r 1df31795fcab -r 71181f1f824d wikked/assets/js/wikked/app.js --- a/wikked/assets/js/wikked/app.js Sat Sep 19 22:06:38 2015 -0700 +++ b/wikked/assets/js/wikked/app.js Sat Sep 19 23:00:55 2015 -0700 @@ -26,13 +26,14 @@ // Cache some stuff for handling the menu. this.wikiMenu = $('#wiki-menu'); + this.wikiMenuAndWrapper = $.merge(this.wikiMenu, $('#app .wrapper')); this.isMenuActive = (this.wikiMenu.css('left') == '0px'); this.isMenuActiveLocked = false; // Apply local settings. var ima = localStorage.getItem('wikked.nav.isMenuActive'); if (ima == 'true') { - this.wikiMenu.addClass('wiki-menu-active'); + this.wikiMenuAndWrapper.addClass('wiki-menu-active'); this.isMenuActive = true; this._toggleWikiMenuPin(true); } @@ -79,11 +80,11 @@ }, _toggleWikiMenu: function(onOff) { if (onOff) { - this.wikiMenu.toggleClass('wiki-menu-inactive', false); - this.wikiMenu.toggleClass('wiki-menu-active', true); + this.wikiMenuAndWrapper.toggleClass('wiki-menu-inactive', false); + this.wikiMenuAndWrapper.toggleClass('wiki-menu-active', true); } else { - this.wikiMenu.toggleClass('wiki-menu-active', false); - this.wikiMenu.toggleClass('wiki-menu-inactive', true); + this.wikiMenuAndWrapper.toggleClass('wiki-menu-active', false); + this.wikiMenuAndWrapper.toggleClass('wiki-menu-inactive', true); } }, _toggleWikiMenuPin: function(onOff) {