changeset 351:71181f1f824d

Menu now correctly adds margin to the rest of the page.
author Ludovic Chabant <ludovic@chabant.com>
date Sat, 19 Sep 2015 23:00:55 -0700
parents 1df31795fcab
children 8123065b3eda
files wikked/assets/js/wikked/app.js
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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) {