fix #1913 @0:20

diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index e7ec70647889e34e54e40502455019c6888939d8..275d1625b396037eac646c56ca47c9b70fab4a19 100644 (file)
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -85,6 +85,9 @@ FluidbookMenu.prototype = {
         } else if (view == 'multimedia') {
             this.openMultimedia(param1, cb);
         } else if (view == 'chapters') {
+            if (param1 == undefined || param1 == 'undefined' || param1 == null || param1 == '') {
+                param1 = 'null';
+            }
             this.openChapters(param1, cb);
         } else if (view == 'archives') {
             this.openArchives($("#nav #archives").data('tooltip'), cb);
@@ -278,6 +281,10 @@ FluidbookMenu.prototype = {
             this.fluidbook.chapters = new FluidbookChapters(this.fluidbook, this.fluidbook.datas.chapters);
         }
 
+        if (submenu == undefined) {
+            submenu = 'null';
+        }
+
         var v = this.fluidbook.chapters.getView(submenu);
         var menuId = 'mview-chapters-' + v.sub;
 

diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index b4bf0937be3837c0ce405af4a4eee3642ad88025..16fe13fa4d8706a67dd4503d0f32b25e31f7a660 100644 (file)
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -458,12 +458,15 @@ FluidbookNav.prototype = {
                 var extraURL = DATAS['navExtraLink' + n];
                 var extraIcon = DATAS['navExtraIcon' + n];
                 var extraVisibility = DATAS['navExtraVisibility' + n];
+                var extraType = DATAS['navExtraType' + n];
+                console.log(extraURL + ';' + extraIcon + ';' + extraVisibility + ';' + extraType);
                 if (extraURL == '' || extraIcon == '') {
                     continue;
                 }
                 if ((extraVisibility == 'horizontal' && navType == 'menu') || (extraVisibility == 'burger' && navType == 'horizontalNav')) {
                     continue;
                 }
+
                 var linkIcon;
 
                 if (extraIcon.indexOf('.') === -1) {
@@ -514,7 +517,7 @@ FluidbookNav.prototype = {
                     }
                     console.log(foundLink);
                     link = $(foundLink).find('a').append(linkIcon);
-                    if (navType == 'menu') {
+                    if (navType == 'menu' && extraType == 'icon') {
                         var tooltip = $(link).data('tooltip');
                         $(link).append('<span class="menu-item-title">' + $(link).data('tooltip') + '</span>');
                     }