From: Vincent Vanwaelscappel Date: Mon, 1 Apr 2019 16:54:16 +0000 (+0200) Subject: wip #2657 @4 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d20acccc4c1beb2fb244403ce2eb903f63b0adc6;p=fluidbook-html5.git wip #2657 @4 --- diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js index 38b6330a..3e265164 100644 --- a/js/libs/fluidbook/fluidbook.js +++ b/js/libs/fluidbook/fluidbook.js @@ -24,7 +24,7 @@ Fluidbook.prototype = { this.canNavigate = false; this.initSettings(datas); - this.singleMode = (this.datas.mobileNavigationType === 'portrait'); + this.singleMode = (this.datas.mobileNavigationType === 'portrait' || this.datas.mobileNavigationType === 'mobilefirst'); this.junk = datas.cacheDate; this.networkControl = new FluidbookNetworkControl(this); diff --git a/js/libs/fluidbook/fluidbook.mobilefirst.js b/js/libs/fluidbook/fluidbook.mobilefirst.js index 89223adf..b564bb63 100644 --- a/js/libs/fluidbook/fluidbook.mobilefirst.js +++ b/js/libs/fluidbook/fluidbook.mobilefirst.js @@ -3,7 +3,7 @@ function FluidbookMobileFirst(fluidbook) { this.enabled = this.fluidbook.datas.mobileNavigationType === 'mobilefirst'; if (this.enabled) { this.init(); - }else{ + } else { $("html").addClass('no-mobilefirst'); } } @@ -11,5 +11,6 @@ function FluidbookMobileFirst(fluidbook) { FluidbookMobileFirst.prototype = { init: function () { $("html").addClass('mobilefirst'); + this.fluidbook.datas.soundTheme = ''; }, } \ No newline at end of file diff --git a/js/libs/fluidbook/fluidbook.sound.js b/js/libs/fluidbook/fluidbook.sound.js index 94c8a16d..f2a47e15 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.datas.soundTheme == '' || !Modernizr.audio || this.fluidbook.support.iOS || this.fluidbook.support.android) { + if (this.fluidbook.datas.soundTheme === '' || !Modernizr.audio || this.fluidbook.support.iOS || this.fluidbook.support.android) { this.enabled = false; this.on = false; return; diff --git a/js/libs/fluidbook/menu/fluidbook.index.js b/js/libs/fluidbook/menu/fluidbook.index.js index 2768cbe1..92edd851 100644 --- a/js/libs/fluidbook/menu/fluidbook.index.js +++ b/js/libs/fluidbook/menu/fluidbook.index.js @@ -23,7 +23,7 @@ FluidbookIndex.prototype = { }, getNormalView: function () { - if (this.normalHTML == '') { + if (this.normalHTML === '') { this.normalHTML += '
'; if (this.fluidbook.datas.indexMessage !== '') { @@ -52,7 +52,7 @@ FluidbookIndex.prototype = { } else { c = ''; - if (this.fluidbook.l10n.dir == 'ltr') { + if (this.fluidbook.l10n.dir === 'ltr') { s1 = 'left'; s2 = 'right' } else {