wait #7840 @1.5

diff --git a/js/libs/fluidbook/fluidbook.burger.js b/js/libs/fluidbook/fluidbook.burger.js
index 7672f81a6883038bb290e629a46f704af73f1537..f230606c2d244499f187ee116e01b17499b766c9 100644 (file)
--- a/js/libs/fluidbook/fluidbook.burger.js
+++ b/js/libs/fluidbook/fluidbook.burger.js
@@ -52,7 +52,6 @@ FluidbookBurger.prototype = {
 
         // Add close button to menu
         this.getElement().prepend(this.getMenuCloseButton());
-
         this.initBurger();
     },
 
@@ -62,14 +61,6 @@ FluidbookBurger.prototype = {
             v2 = ' class="v2"';
         }
 
-        let navOrder;
-        // Use navOrderH (mobile icon order) if it is set
-        if (this.fluidbook.settings.navOrderH.length > 0) {
-            navOrder = this.fluidbook.settings.navOrderH;
-        } else {
-            navOrder = this.fluidbook.settings.navOrder;
-        }
-
         var menuOpener = '<a href="#" id="menuOpener" aria-expanded="false" aria-controls="menu" aria-keyshortcuts="F10">' + getSpriteIcon('interface-menu') + '<span class="label">' + this.fluidbook.l10n.__('Menu') + '</span></a>';
         $('#main header').append(menuOpener);
 
@@ -83,71 +74,15 @@ FluidbookBurger.prototype = {
 
     initBurger: function () {
 
-        var $this = this, dir = this.fluidbook.l10n.dir, inverted = this.nav.isInverted(),
-            side = ((dir === 'ltr' && inverted) || (dir === 'rtl' && !inverted)) ? 'right' : 'left';
+        var $this = this;
+        var dir = this.fluidbook.l10n.dir;
+        var inverted = this.nav.isInverted();
+        var side = ((dir === 'ltr' && inverted) || (dir === 'rtl' && !inverted)) ? 'right' : 'left';
 
 
         $("#menu").insertAfter('#main');
         $('<div id="menuOverlay"></div>').insertAfter('#menu');
 
-        // var extensions = ['pagedim-black', 'position-front'];
-        // if (side === 'right') {
-        //     extensions.push('position-right');
-        // }
-        //
-        // this.menu.mmenu({
-        //
-        //     // Allow #anchor links to trigger correctly and close the menu
-        //     // Ref: https://github.com/FrDH/jQuery.mmenu/issues/687#issuecomment-279377172
-        //     onClick: {
-        //         close: function () {
-        //             if (fluidbook.settings.phonegap === 'ios') {
-        //                 return !$(this).is('#menu_download,#menu_print');
-        //             }
-        //             return true;
-        //         }, preventDefault: function () {
-        //             return false;
-        //         },
-        //     },
-        //
-        //     "extensions": extensions, "offCanvas": {
-        //         "position": side, "zposition": "front",
-        //     }, "navbar": {
-        //         //add: false // Removes main title bars completely
-        //         title: "" // Hides the default "Menu" text
-        //     }, "rtl": {
-        //         "use": "detect" // Auto detect when in RTL mode based on html dir attribute
-        //     },
-        //
-        // }, {
-        //     offCanvas: {
-        //         page: {
-        //             noSelector: ['#loader']
-        //         }
-        //     }
-        // });
-        //
-        // this.menuAPI = this.menu.data('mmenu');
-        //
-        // // Bind API hooks (see http://mmenu.frebsite.nl/documentation/core/off-canvas.html#h4)
-        // this.menuAPI.bind("open:finish", function () {
-        //     $('body').addClass('menu-open');
-        //     $("nav#menu").addClass('mm-menu_opened');
-        //     $this.menuIsOpen = true;
-        //
-        //     setInterval(function () {
-        //         $this.fluidbook.resize.resizeMenu()
-        //     }, 500);
-        //
-        //     //$('#q').focus(); // Disabled for now because it triggers the keyboard to open on some mobile devices
-        // });
-        //
-        // this.menuAPI.bind("close:finish", function () {
-        //     $('body').removeClass('menu-open');
-        //     $this.menuIsOpen = false;
-        // });
-
-
         $(document).on(this.fluidbook.input.clickEvent, '#menuOpener', function (e) {
             e.preventDefault();
             $this.open();

diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index 098ea52f38a6e4a3ffb80b87bd8c72e87d913669..aa4f0399dfff4bda972ce99a6b4025a0c99b8206 100644 (file)
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -185,7 +185,8 @@ FluidbookNav.prototype = {
          * __('switch on the sound')
          * __('notes')
          */
-        var $this = this, navOrder = this.fluidbook.settings.navOrder; // Default desktop order, maybe be overridden later
+        var $this = this;
+        var navOrder = this.fluidbook.settings.navOrder; // Default desktop order, maybe be overridden later
 
         var v2 = '';
         if (this.fluidbook.settings.iconSet < 15) {
@@ -195,8 +196,9 @@ FluidbookNav.prototype = {
         // MMenu specific elements
         if (navType === 'menu') {
             this.burger.initNav();
-
-            // Horizontal icon nav
+            if (this.fluidbook.settings.navOrderH.length > 0) {
+                navOrder = this.fluidbook.settings.navOrderH;
+            }
         } else if (navType === 'horizontalNav') {
             $nav.append('<ul id="iconList"' + v2 + '></ul>');
         }