From 4d7293d14105ef40e39feab4b1d03f0e71a299a2 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 22 May 2023 12:20:42 +0200 Subject: [PATCH] wait #5934 @0.5 --- js/libs/fluidbook/fluidbook.nav.js | 8 +++++--- js/libs/fluidbook/fluidbook.sound.js | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js index 9c1c1379..b17d259e 100644 --- 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 8456515a..2935e34a 100644 --- 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; -- 2.39.5