wait #5934 @0.5

diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index 9c1c1379109ec44fd05c8e53f2ecac7b4b540d78..b17d259e8a315f5546f20245b00184297b0a9a34 100644 (file)
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -9,7 +9,9 @@ function FluidbookNav(fluidbook) {
     this.horizontalNav = $("#horizontalNav");
     this._inited = {};
     this.setNav('horizontalNav');
-    this.setNav('menu');
+    if($("#iconList").html()!=='') {
+        this.setNav('menu');
+    }
     if (Modernizr.msie) {
         $('#horizontalNav svg').each(function () {
             var h = 25;
@@ -386,7 +388,7 @@ FluidbookNav.prototype = {
                     return false;
                 });
 
-            } else if (icon === 'index') {
+            } else if (icon === 'index' && this.fluidbook.settings.index !== false) {
                 // __('overview')
                 link = this.addLink(navType, 'nav-index', '#/index', 'index', 'overview', 'overview', 'Control+O');
             } else if (icon === 'chapters') {
@@ -460,7 +462,7 @@ FluidbookNav.prototype = {
                 link = this.addLink(navType, 'nav-locales', '#/locales', 'locales', '!' + this.fluidbook.l10n.getCurrentLanguageName(), '!Select Language', 'Control+L');
             } else if (icon === 'archives' && this.fluidbook.settings.externalArchives) {
                 link = this.addLink(navType, 'nav-archives', '#/archives', 'archives', '!' + this.fluidbook.settings.archivesLabel, '!' + this.fluidbook.settings.archivesLabel, '');
-            } else if (icon === 'help') {
+            } else if (icon === 'help' && this.fluidbook.settings.help) {
                 // __('help')
                 link = this.addLink(navType, 'nav-help', '#', 'help', 'help', 'help', 'F1');
             } else if (icon === 'zoom' && !this.fluidbook.support.isMobile) {

diff --git a/js/libs/fluidbook/fluidbook.sound.js b/js/libs/fluidbook/fluidbook.sound.js
index 8456515a215a2642876cb98ecec0416bfec98c15..2935e34afe9179467600057e48581d82a228e035 100644 (file)
--- a/js/libs/fluidbook/fluidbook.sound.js
+++ b/js/libs/fluidbook/fluidbook.sound.js
@@ -1,7 +1,7 @@
 function FluidbookSound(fluidbook) {
     this.fluidbook = fluidbook;
 
-    if (this.fluidbook.settings.soundTheme === '' || !Modernizr.audio || this.fluidbook.support.iOS || this.fluidbook.support.android) {
+    if (this.fluidbook.settings.soundTheme === 'none' || !Modernizr.audio || this.fluidbook.support.iOS || this.fluidbook.support.android) {
         this.enabled = false;
         this.on = false;
         return;