From: Vincent Vanwaelscappel Date: Fri, 31 Jan 2020 14:44:21 +0000 (+0100) Subject: wip #3386 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=873846a5186ac29651a041fd5012a3f56d6d7c93;p=fluidbook-html5.git wip #3386 @0.5 --- diff --git a/js/libs/fluidbook/fluidbook.3dflip.js b/js/libs/fluidbook/fluidbook.3dflip.js index d3585d82..abb10245 100644 --- a/js/libs/fluidbook/fluidbook.3dflip.js +++ b/js/libs/fluidbook/fluidbook.3dflip.js @@ -66,8 +66,8 @@ Fluidbook3DFlip.prototype = { var debugInfo = gl.getExtension('WEBGL_debug_renderer_info'); var renderer = gl.getParameter(debugInfo.UNMASKED_RENDERER_WEBGL); - if (this.fluidbook.datas.gupsc[renderer] !== undefined && this.fluidbook.datas.gupsc[renderer] !== null) { - this.benchmark = this.fluidbook.datas.gupsc[renderer]; + if (this.fluidbook.settings.gupsc[renderer] !== undefined && this.fluidbook.settings.gupsc[renderer] !== null) { + this.benchmark = this.fluidbook.settings.gupsc[renderer]; cb(); } else { $.ajax({ @@ -226,7 +226,7 @@ Fluidbook3DFlip.prototype = { this.enableLight = !this.lowPerf && this.renderEngine === 'webgl'; this.enableShadow = !this.lowPerf && this.enableLight && this.renderEngine === 'webgl'; this.antialias = false; - this.animationTime = parseFloat(this.fluidbook.datas.mobileTransitionDuration); + this.animationTime = parseFloat(this.fluidbook.settings.mobileTransitionDuration); if (this.veryLowPerf) { this.qualityRatio = .8; @@ -286,7 +286,7 @@ Fluidbook3DFlip.prototype = { } var geometry; if (this.enableShadow) { - geometry = new THREE.PlaneGeometry(this.fluidbook.datas.width * this.geometryScale * 2, this.fluidbook.datas.height * this.geometryScale, 1, 1, true); + geometry = new THREE.PlaneGeometry(this.fluidbook.settings.width * this.geometryScale * 2, this.fluidbook.settings.height * this.geometryScale, 1, 1, true); var shadowTexture = new THREE.ShadowMaterial({ color: 0x000000, side: THREE.FrontSide, @@ -299,8 +299,8 @@ Fluidbook3DFlip.prototype = { this.scene.add(this.shadowPlane); } - this.geometryWidth = this.fluidbook.datas.width * this.geometryScale; - this.geometryHeight = this.fluidbook.datas.height * this.geometryScale; + this.geometryWidth = this.fluidbook.settings.width * this.geometryScale; + this.geometryHeight = this.fluidbook.settings.height * this.geometryScale; geometry = new THREE.PlaneGeometry(this.geometryWidth, this.geometryHeight, Math.round(this.triangles * 5), Math.round(this.triangles), true); var geometry2 = geometry.clone(); @@ -326,7 +326,7 @@ Fluidbook3DFlip.prototype = { ]; } - geometry.translate(this.fluidbook.datas.width * this.geometryScale * 0.5, 0, 0); + geometry.translate(this.fluidbook.settings.width * this.geometryScale * 0.5, 0, 0); this.plane = new THREE.Mesh(geometry, this.textures); this.plane.castShadow = this.enableShadow; @@ -345,7 +345,7 @@ Fluidbook3DFlip.prototype = { this.bendOffset = 0.65; this.bendForceMultiplicator = 1; - var ratio = this.fluidbook.datas.width / this.fluidbook.datas.height; + var ratio = this.fluidbook.settings.width / this.fluidbook.settings.height; if (ratio > 1.2) { this.bendAngle = 15; diff --git a/js/libs/fluidbook/fluidbook.audiodescription.js b/js/libs/fluidbook/fluidbook.audiodescription.js index 669983c4..e6d4d13f 100644 --- a/js/libs/fluidbook/fluidbook.audiodescription.js +++ b/js/libs/fluidbook/fluidbook.audiodescription.js @@ -134,13 +134,13 @@ FluidbookAudioDescription.prototype = { return false; } - if (this.fluidbook.datas.audiodescription === undefined) return false; + if (this.fluidbook.settings.audiodescription === undefined) return false; - return (this.fluidbook.datas.audiodescription[page] !== undefined); + return (this.fluidbook.settings.audiodescription[page] !== undefined); }, getAudio: function (page) { - return this.dataPath + this.fluidbook.datas.audiodescription[page]; + return this.dataPath + this.fluidbook.settings.audiodescription[page]; }, playSide: function (side) { diff --git a/js/libs/fluidbook/fluidbook.background.js b/js/libs/fluidbook/fluidbook.background.js index d5107998..aa1cab51 100644 --- a/js/libs/fluidbook/fluidbook.background.js +++ b/js/libs/fluidbook/fluidbook.background.js @@ -6,12 +6,12 @@ function FluidbookBackground(fluidbook) { FluidbookBackground.prototype = { init: function () { - if (this.fluidbook.datas.links.background !== undefined - && (this.fluidbook.datas.repeat !== Fluidbook.REPEAT || this.fluidbook.tabs.hasTabs()) - && this.fluidbook.datas.links.background !== '' - && this.fluidbook.datas.mobileIgnoreBackgroundLinks === false) { + if (this.fluidbook.settings.links.background !== undefined + && (this.fluidbook.settings.repeat !== Fluidbook.REPEAT || this.fluidbook.tabs.hasTabs()) + && this.fluidbook.settings.links.background !== '' + && this.fluidbook.settings.mobileIgnoreBackgroundLinks === false) { - $("#background").prepend('
' + this.fluidbook.datas.links.background + '
'); + $("#background").prepend('
' + this.fluidbook.settings.links.background + '
'); this.hasLinks = true; } }, @@ -27,26 +27,26 @@ FluidbookBackground.prototype = { var left, top, iw, ih; - if (this.fluidbook.datas.backgroundImageDimensions === undefined) { + if (this.fluidbook.settings.backgroundImageDimensions === undefined) { - } else if (this.fluidbook.datas.repeat === Fluidbook.NONE) { - iw = this.fluidbook.datas.backgroundImageDimensions.width; - ih = this.fluidbook.datas.backgroundImageDimensions.height; + } else if (this.fluidbook.settings.repeat === Fluidbook.NONE) { + iw = this.fluidbook.settings.backgroundImageDimensions.width; + ih = this.fluidbook.settings.backgroundImageDimensions.height; - if (this.fluidbook.datas.backgroundHAlign === Fluidbook.LEFT) { + if (this.fluidbook.settings.backgroundHAlign === Fluidbook.LEFT) { left = 0 - } else if (this.fluidbook.datas.backgroundHAlign === Fluidbook.RIGHT) { + } else if (this.fluidbook.settings.backgroundHAlign === Fluidbook.RIGHT) { left = w - iw; - } else if (this.fluidbook.datas.backgroundHAlign === Fluidbook.CENTER) { + } else if (this.fluidbook.settings.backgroundHAlign === Fluidbook.CENTER) { left = (w - iw) / 2; } - if (this.fluidbook.datas.backgroundVAlign === Fluidbook.TOP) { + if (this.fluidbook.settings.backgroundVAlign === Fluidbook.TOP) { top = 0 - } else if (this.fluidbook.datas.backgroundVAlign === Fluidbook.BOTTOM) { + } else if (this.fluidbook.settings.backgroundVAlign === Fluidbook.BOTTOM) { top = h - ih; - } else if (this.fluidbook.datas.backgroundVAlign === Fluidbook.MIDDLE) { + } else if (this.fluidbook.settings.backgroundVAlign === Fluidbook.MIDDLE) { top = (h - ih) / 2; } @@ -54,41 +54,41 @@ FluidbookBackground.prototype = { top: top, left: left }); - } else if (this.fluidbook.datas.repeat === Fluidbook.RATIO || this.fluidbook.datas.repeat === Fluidbook.STRETCH) { + } else if (this.fluidbook.settings.repeat === Fluidbook.RATIO || this.fluidbook.settings.repeat === Fluidbook.STRETCH) { var origin = ['0%', '0%', '0%']; - // if (this.fluidbook.datas.backgroundHAlign == Fluidbook.LEFT) { + // if (this.fluidbook.settings.backgroundHAlign == Fluidbook.LEFT) { // origin[0] = '0%'; - // } else if (this.fluidbook.datas.backgroundHAlign == Fluidbook.RIGHT) { + // } else if (this.fluidbook.settings.backgroundHAlign == Fluidbook.RIGHT) { // origin[0] = '100%'; - // } else if (this.fluidbook.datas.backgroundHAlign == Fluidbook.CENTER) { + // } else if (this.fluidbook.settings.backgroundHAlign == Fluidbook.CENTER) { // origin[0] = '50%'; // } - // if (this.fluidbook.datas.backgroundVAlign == Fluidbook.TOP) { + // if (this.fluidbook.settings.backgroundVAlign == Fluidbook.TOP) { // origin[1] = '0%'; - // } else if (this.fluidbook.datas.backgroundVAlign == Fluidbook.BOTTOM) { + // } else if (this.fluidbook.settings.backgroundVAlign == Fluidbook.BOTTOM) { // origin[1] = '100%'; - // } else if (this.fluidbook.datas.backgroundVAlign == Fluidbook.MIDDLE) { + // } else if (this.fluidbook.settings.backgroundVAlign == Fluidbook.MIDDLE) { // origin[1] = '50%'; // } // // Todo, search why this works :) origin = ['0%', '0%', '0%']; - var bw = parseFloat(this.fluidbook.datas.backgroundImageDimensions.width); - var bh = parseFloat(this.fluidbook.datas.backgroundImageDimensions.height); + var bw = parseFloat(this.fluidbook.settings.backgroundImageDimensions.width); + var bh = parseFloat(this.fluidbook.settings.backgroundImageDimensions.height); var translateX = 0; var translateY = 0; var css = {}; var scaleX = w / bw; var scaleY = h / bh; - if (this.fluidbook.datas.repeat === Fluidbook.RATIO) { + if (this.fluidbook.settings.repeat === Fluidbook.RATIO) { if (scaleX < scaleY) { var l = ((scaleX - scaleY) * bw); - if (this.fluidbook.datas.backgroundHAlign === Fluidbook.CENTER) { + if (this.fluidbook.settings.backgroundHAlign === Fluidbook.CENTER) { css.left = l / 2; - } else if (this.fluidbook.datas.backgroundHAlign === Fluidbook.LEFT) { + } else if (this.fluidbook.settings.backgroundHAlign === Fluidbook.LEFT) { css.left = 0; } } else { diff --git a/js/libs/fluidbook/fluidbook.bookmarks.js b/js/libs/fluidbook/fluidbook.bookmarks.js index 92a3324f..def03894 100644 --- a/js/libs/fluidbook/fluidbook.bookmarks.js +++ b/js/libs/fluidbook/fluidbook.bookmarks.js @@ -17,7 +17,7 @@ function FluidbookBookmarks(fluidbook) { this._cornersIndex = []; this._cornersPages = []; - this.enabled = this.fluidbook.datas.bookmark; + this.enabled = this.fluidbook.settings.bookmark; this.init(); } @@ -32,18 +32,18 @@ FluidbookBookmarks.prototype = { $(document).on('click', '.bookmarkssub a.send', function () { var subject = '%title%'; - if ($this.fluidbook.datas.bookmark_email_title !== '') { - subject = $this.fluidbook.datas.bookmark_email_title; + if ($this.fluidbook.settings.bookmark_email_title !== '') { + subject = $this.fluidbook.settings.bookmark_email_title; } var body = $this.fluidbook.l10n.__('Please see the attached files from "%title%".'); - if ($this.fluidbook.datas.bookmark_email_body !== '') { - body = $this.fluidbook.datas.bookmark_email_body; + if ($this.fluidbook.settings.bookmark_email_body !== '') { + body = $this.fluidbook.settings.bookmark_email_body; } - subject = subject.replace(/\%title\%/gi, $this.fluidbook.datas.title); - body = trim(body.replace(/\%title\%/gi, $this.fluidbook.datas.title), ' .:'); + subject = subject.replace(/\%title\%/gi, $this.fluidbook.settings.title); + body = trim(body.replace(/\%title\%/gi, $this.fluidbook.settings.title), ' .:'); body += $this.fluidbook.l10n.__(": ") + $this.getPDF(); $this.fluidbook.share.intentShare(subject, body); @@ -52,7 +52,7 @@ FluidbookBookmarks.prototype = { $(document).on('click', '.bookmarkssub a.download', function () { $(this).data('ios-preview', '1'); - if (!navigator.onLine && $this.fluidbook.datas.phonegap) { + if (!navigator.onLine && $this.fluidbook.settings.phonegap) { $this.fluidbook.alertInternetRequired(); return false; } @@ -60,9 +60,9 @@ FluidbookBookmarks.prototype = { return false; }); - for (var g in this.fluidbook.datas.bookmarkGroups) { + for (var g in this.fluidbook.settings.bookmarkGroups) { - var group = this.fluidbook.datas.bookmarkGroups[g]; + var group = this.fluidbook.settings.bookmarkGroups[g]; this.addGroup(group.page, group.nb, group.name); } this.completeGroups(); @@ -86,7 +86,7 @@ FluidbookBookmarks.prototype = { this.fluidbook._openFile(this.getPDF(), element, 'pdf', this.getBookmarksCompacted() + '.pdf', print); }, getPDF: function () { - return 'https://workshop.fluidbook.com/s/e/' + this.fluidbook.datas.cid + '/' + this.getBookmarksCompacted(); + return 'https://workshop.fluidbook.com/s/e/' + this.fluidbook.settings.cid + '/' + this.getBookmarksCompacted(); }, getBookmarksCompacted: function () { this.bookmarks.sort(this.sortnumeric); @@ -128,7 +128,7 @@ FluidbookBookmarks.prototype = { return g.join(','); }, addGroup: function (from, nb, name) { - var to = Math.min(from + (nb - 1), this.fluidbook.datas.pages); + var to = Math.min(from + (nb - 1), this.fluidbook.settings.pages); for (var i = from; i <= to; i++) { this._pagesToGroup[i] = this._groups; } @@ -137,7 +137,7 @@ FluidbookBookmarks.prototype = { this._groups++; }, completeGroups: function () { - for (var i = 1; i <= this.fluidbook.datas.pages; i++) { + for (var i = 1; i <= this.fluidbook.settings.pages; i++) { if (this._pagesToGroup[i] === undefined || this._pagesToGroup[i] === null) { this._pagesToGroup[i] = this._groups; this._groupOrder.push(this._groups); @@ -181,7 +181,7 @@ FluidbookBookmarks.prototype = { }, getPagesOfGroup: function (groupId) { var res = []; - for (var i = 1; i <= this.fluidbook.datas.pages; i++) { + for (var i = 1; i <= this.fluidbook.settings.pages; i++) { if (this._pagesToGroup[i] === groupId) { res.push(i); } @@ -355,7 +355,7 @@ FluidbookBookmarks.prototype = { return this.areBookmarksAllowedOn(page) && this.bookmarks.indexOf(page) > -1; }, areBookmarksAllowedOn: function (pageNr) { - return this.fluidbook.datas.bookmarkDisablePages.indexOf(pageNr) === -1; + return this.fluidbook.settings.bookmarkDisablePages.indexOf(pageNr) === -1; }, getBookmarkForPage: function (pageNr, allwaysAtRight, permanentIcon) { if (!this.areBookmarksAllowedOn(pageNr)) { @@ -498,11 +498,11 @@ FluidbookBookmarks.prototype = { } index += ''; index += '
'; - if (this.fluidbook.datas.friend && this.fluidbook.datas.bookmarkSendEnable) { + if (this.fluidbook.settings.friend && this.fluidbook.settings.bookmarkSendEnable) { index += '' + this.fluidbook.l10n.__('send') + ''; } - if (this.fluidbook.datas.print || this.fluidbook.datas.pdf) { + if (this.fluidbook.settings.print || this.fluidbook.settings.pdf) { // ToDo: differentiate between download & print? index += '' + downloadLabel + ''; } diff --git a/js/libs/fluidbook/fluidbook.cart.js b/js/libs/fluidbook/fluidbook.cart.js index e8d7b4f2..6c1036bf 100644 --- a/js/libs/fluidbook/fluidbook.cart.js +++ b/js/libs/fluidbook/fluidbook.cart.js @@ -7,7 +7,7 @@ function FluidbookCart(fluidbook) { FluidbookCart.prototype = { init: function () { - if (!this.fluidbook.datas.basket) { + if (!this.fluidbook.settings.basket) { return false; } var $this = this; @@ -39,7 +39,7 @@ FluidbookCart.prototype = { this.fluidbook.cache.set('cart', data); }, createInstance: function () { - switch (this.fluidbook.datas.basketManager) { + switch (this.fluidbook.settings.basketManager) { case "Remarkable": return new FluidbookCartRemarkable(this); default: diff --git a/js/libs/fluidbook/fluidbook.contentlock.js b/js/libs/fluidbook/fluidbook.contentlock.js index e1f75a9d..a0ffee83 100644 --- a/js/libs/fluidbook/fluidbook.contentlock.js +++ b/js/libs/fluidbook/fluidbook.contentlock.js @@ -2,7 +2,7 @@ function FluidbookContentLock(fluidbook) { this.fluidbook = fluidbook; this.maxPage; this.linksActions = {}; - this.locks = this.fluidbook.datas.content_lock; + this.locks = this.fluidbook.settings.content_lock; } FluidbookContentLock.prototype = { @@ -15,7 +15,7 @@ FluidbookContentLock.prototype = { this.maxPage = this.getNextLockPage(); if (this.maxPage <= 0) { - this.maxPage = this.fluidbook.datas.pages; + this.maxPage = this.fluidbook.settings.pages; } }, @@ -38,14 +38,14 @@ FluidbookContentLock.prototype = { allowbackwards = false; } if (p === undefined || p <= 0) { - p = this.fluidbook.datas.pages; + p = this.fluidbook.settings.pages; } if (!allowbackwards && p < this.maxPage) { return; } - this.maxPage = Math.min(p, this.fluidbook.datas.pages); + this.maxPage = Math.min(p, this.fluidbook.settings.pages); if (currentMaxPage === this.maxPage) { return; } diff --git a/js/libs/fluidbook/fluidbook.desktop.js b/js/libs/fluidbook/fluidbook.desktop.js index d8798bc5..d6e51c2a 100644 --- a/js/libs/fluidbook/fluidbook.desktop.js +++ b/js/libs/fluidbook/fluidbook.desktop.js @@ -57,7 +57,7 @@ FluidbookDesktop.prototype = { } var newScale; if (way == 1) { - newScale = this.fluidbook.datas.zoom / 100; + newScale = this.fluidbook.settings.zoom / 100; } else if (way == -1) { newScale = 1; } diff --git a/js/libs/fluidbook/fluidbook.help.js b/js/libs/fluidbook/fluidbook.help.js index 059ec873..0ad58b6b 100644 --- a/js/libs/fluidbook/fluidbook.help.js +++ b/js/libs/fluidbook/fluidbook.help.js @@ -87,7 +87,7 @@ FluidbookHelp.prototype = { // When the menu position is inverted, the icon help lines need // to be drawn in the reverse order to avoid text/line overlaps - var tooltips = this.fluidbook.datas.invertMenuPosition ? $(tooltipSelector).get().reverse() : $(tooltipSelector); + var tooltips = this.fluidbook.settings.invertMenuPosition ? $(tooltipSelector).get().reverse() : $(tooltipSelector); var navScale = this.fluidbook.resize.navScale; var initialHeight = 20 * navScale; // Buffer in line height away from icons var hStep = 25 * navScale; // The step height - the difference in height between the icon label lines @@ -272,7 +272,7 @@ FluidbookHelp.prototype = { var $this = this; var dir = this.fluidbook.l10n.dir; - var menuHeightScaled = (this.fluidbook.datas.menuHeight) * navScale; + var menuHeightScaled = (this.fluidbook.settings.menuHeight) * navScale; var nextTop; var firstTop; @@ -301,7 +301,7 @@ FluidbookHelp.prototype = { } if (this.fluidbook.bookmarks.enabled) { - var inverted = this.fluidbook.datas.invertMenuPosition; + var inverted = this.fluidbook.settings.invertMenuPosition; var side = ((this.fluidbook.l10n.dir === 'ltr' && inverted) || (this.fluidbook.l10n.dir === 'rtl' && !inverted)) ? 'left' : 'right'; if (this.fluidbook.mobilefirst.enabled) { side = 'right'; @@ -386,9 +386,9 @@ FluidbookHelp.prototype = { }, displayAtStartup: function () { - if (this.fluidbook.datas.helpStartup) { + if (this.fluidbook.settings.helpStartup) { var $this = this; - var time = parseInt(this.fluidbook.datas.helpStartupTime); + var time = parseInt(this.fluidbook.settings.helpStartupTime); this.ignoreResize = true; setTimeout(function () { $this.ignoreResize = false; @@ -398,8 +398,8 @@ FluidbookHelp.prototype = { this.fluidbook.pad.displayInterface(); } } else { - if (this.fluidbook.datas.landscapeWarning !== '' && (this.fluidbook.support.iOS || this.fluidbook.support.android)) { - this.fluidbook.menu.openView('text', this.fluidbook.datas.landscapeWarning, function () { + if (this.fluidbook.settings.landscapeWarning !== '' && (this.fluidbook.support.iOS || this.fluidbook.support.android)) { + this.fluidbook.menu.openView('text', this.fluidbook.settings.landscapeWarning, function () { }); } @@ -419,7 +419,7 @@ FluidbookHelp.prototype = { // be possible to always display the bookmark icon in this case... var dir = this.fluidbook.l10n.dir; - var inverted = this.fluidbook.datas.invertMenuPosition; + var inverted = this.fluidbook.settings.invertMenuPosition; var side = ((dir === 'ltr' && inverted) || (dir === 'rtl' && !inverted)) ? 'left' : 'right'; if (this.fluidbook.mobilefirst.enabled) { side = 'right'; diff --git a/js/libs/fluidbook/fluidbook.interface.js b/js/libs/fluidbook/fluidbook.interface.js index 5a1a319d..e07128aa 100644 --- a/js/libs/fluidbook/fluidbook.interface.js +++ b/js/libs/fluidbook/fluidbook.interface.js @@ -38,7 +38,7 @@ FluidbookInterface.prototype = { }, arrowsEnabled: function () { - switch (this.fluidbook.datas.arrowsEnabled) { + switch (this.fluidbook.settings.arrowsEnabled) { case '0': return false; case '1': diff --git a/js/libs/fluidbook/fluidbook.l10n.js b/js/libs/fluidbook/fluidbook.l10n.js index 9a70d071..e29a49e9 100644 --- a/js/libs/fluidbook/fluidbook.l10n.js +++ b/js/libs/fluidbook/fluidbook.l10n.js @@ -16,7 +16,7 @@ FluidbookL10N.prototype = { } this.lang = lang; if (this.lang === "default") { - this.currentLang = this.fluidbook.datas.defaultLang; + this.currentLang = this.fluidbook.settings.defaultLang; } else { this.currentLang = this.lang; } @@ -34,10 +34,10 @@ FluidbookL10N.prototype = { } if (this.lang === 'default') { - this.translations = this.fluidbook.datas.l10n[this.fluidbook.datas.defaultLang]; - $.extend(this.translations, this.fluidbook.datas.l10n[this.lang]); + this.translations = this.fluidbook.settings.l10n[this.fluidbook.settings.defaultLang]; + $.extend(this.translations, this.fluidbook.settings.l10n[this.lang]); } else { - this.translations = this.fluidbook.datas.l10n[this.lang]; + this.translations = this.fluidbook.settings.l10n[this.lang]; } this.updateTranslations(); @@ -45,12 +45,12 @@ FluidbookL10N.prototype = { getActiveLang: function () { var res = this.lang; if (this.lang === 'default') { - res = this.fluidbook.datas.defaultLang; + res = this.fluidbook.settings.defaultLang; } // Append country when lang is present more than one time in the list if (undefined !== this._langsCount && this._langsCount[res] > 1) { - res += '_' + this.fluidbook.datas.country; + res += '_' + this.fluidbook.settings.country; } return res; }, @@ -74,17 +74,17 @@ FluidbookL10N.prototype = { } if (!force) { - if (this.fluidbook.datas.multilang == '') { + if (this.fluidbook.settings.multilang == '') { return; } - if (this.fluidbook.datas.multiApp) { + if (this.fluidbook.settings.multiApp) { return; } } this.multilangEnabled = true; var $this = this; - var ml = this.fluidbook.datas.multilang.replace(/\r/g, "\n").replace(/\n+/g, "\n"); + var ml = this.fluidbook.settings.multilang.replace(/\r/g, "\n").replace(/\n+/g, "\n"); var e = ml.split("\n"); this._langsCount = {}; @@ -151,7 +151,7 @@ FluidbookL10N.prototype = { return name; } - switch (this.fluidbook.datas.multilangDisplay) { + switch (this.fluidbook.settings.multilangDisplay) { case 'lang': name = details.langName; break; diff --git a/js/libs/fluidbook/fluidbook.landingpage.js b/js/libs/fluidbook/fluidbook.landingpage.js index 388fa080..7ec58b7d 100644 --- a/js/libs/fluidbook/fluidbook.landingpage.js +++ b/js/libs/fluidbook/fluidbook.landingpage.js @@ -9,7 +9,7 @@ FluidbookLandingPage.prototype = { init: function () { var $this = this; - if (this.fluidbook.datas.landingPage != undefined && this.fluidbook.datas.landingPage != '') { + if (this.fluidbook.settings.landingPage != undefined && this.fluidbook.settings.landingPage != '') { this.hasLandingPage = true; } diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index f24d6845..3cd475cd 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -75,7 +75,7 @@ FluidbookLinks.prototype = { return true; } - if (!navigator.onLine && external && $this.fluidbook.datas.phonegap) { + if (!navigator.onLine && external && $this.fluidbook.settings.phonegap) { $this.fluidbook.alertInternetRequired(); e.preventDefault(); e.stopPropagation(); @@ -87,7 +87,7 @@ FluidbookLinks.prototype = { target = '_system'; } - if ($this.fluidbook.datas.phonegap === 'android' && $(this).data('type') === 16 && !external) { + if ($this.fluidbook.settings.phonegap === 'android' && $(this).data('type') === 16 && !external) { var url = $(this).attr('href') $this.fluidbook._openFile($this.fluidbook.relativeToAbsolute(url), $("body"), 'pdf'); return; @@ -210,12 +210,12 @@ FluidbookLinks.prototype = { var rightContainer = links.find('.rightContainer'); var leftContainer = links.find('.leftContainer'); - rightContainer.html(this.fluidbook.datas.links[rightPage]); - leftContainer.html(this.fluidbook.datas.links[leftPage]); + rightContainer.html(this.fluidbook.settings.links[rightPage]); + leftContainer.html(this.fluidbook.settings.links[leftPage]); - if (this.fluidbook.datas.bookmark) { - leftContainer.append(this.fluidbook.bookmarks.getBookmarkForPage(leftPage, this.fluidbook.displayOnePage, this.fluidbook.datas.bookmarkPermanentIcon)); - rightContainer.append(this.fluidbook.bookmarks.getBookmarkForPage(rightPage, this.fluidbook.displayOnePage, this.fluidbook.datas.bookmarkPermanentIcon)); + if (this.fluidbook.settings.bookmark) { + leftContainer.append(this.fluidbook.bookmarks.getBookmarkForPage(leftPage, this.fluidbook.displayOnePage, this.fluidbook.settings.bookmarkPermanentIcon)); + rightContainer.append(this.fluidbook.bookmarks.getBookmarkForPage(rightPage, this.fluidbook.displayOnePage, this.fluidbook.settings.bookmarkPermanentIcon)); } if (this.fluidbook.displayOnePage) { @@ -253,7 +253,7 @@ FluidbookLinks.prototype = { }, animateLinks: function () { - if (this.fluidbook.datas.linkBlinkTime == 0 || this.fluidbook.datas.linkBlinkRepetition == 0 || !this.fluidbook.datas.mobileLinksRevealAnim) { + if (this.fluidbook.settings.linkBlinkTime == 0 || this.fluidbook.settings.linkBlinkRepetition == 0 || !this.fluidbook.settings.mobileLinksRevealAnim) { return; } var $this = this; @@ -448,12 +448,12 @@ FluidbookLinks.prototype = { }, getLinkDataById: function (uid) { - return this.fluidbook.datas.linksData[uid]; + return this.fluidbook.settings.linksData[uid]; }, getLinkByHref: function (href) { - for (var i = 1; i <= this.fluidbook.datas.pages; i++) { - var res = $(this.fluidbook.datas.links[i]).find('a[href="' + href + '"]'); + for (var i = 1; i <= this.fluidbook.settings.pages; i++) { + var res = $(this.fluidbook.settings.links[i]).find('a[href="' + href + '"]'); if (res.length > 0) { return res.eq('0'); } @@ -474,7 +474,7 @@ FluidbookLinks.prototype = { return; } - var animateBookmarks = (this.fluidbook.datas.bookmarkBlinkOnPageChange == true); + var animateBookmarks = (this.fluidbook.settings.bookmarkBlinkOnPageChange == true); var $this = this; var links = $(container).find(".link a.displayArea"); @@ -509,12 +509,12 @@ FluidbookLinks.prototype = { var speed = 0.5; var timeline = new TimelineMax(); - var repetitions = this.fluidbook.datas.linkBlinkRepetition - 1; + var repetitions = this.fluidbook.settings.linkBlinkRepetition - 1; el.addClass('animating'); var d = 0.1; if (repetitions > 0) { el.css('opacity', 0); - timeline.add(TweenMax.to(el, this.fluidbook.datas.linkBlinkTime * speed, { + timeline.add(TweenMax.to(el, this.fluidbook.settings.linkBlinkTime * speed, { delay: 0.1, opacity: 1, ease: Linear.easeNone @@ -524,16 +524,16 @@ FluidbookLinks.prototype = { el.css('opacity', 1); } for (var i = 0; i < repetitions; i++) { - timeline.add(TweenMax.to(el, this.fluidbook.datas.linkBlinkTime * speed, { + timeline.add(TweenMax.to(el, this.fluidbook.settings.linkBlinkTime * speed, { opacity: 0.5, ease: Linear.easeNone })); - timeline.add(TweenMax.to(el, this.fluidbook.datas.linkBlinkTime * speed, { + timeline.add(TweenMax.to(el, this.fluidbook.settings.linkBlinkTime * speed, { opacity: 1, ease: Linear.easeNone })); } - timeline.add(TweenMax.to(el, this.fluidbook.datas.linkBlinkTime, { + timeline.add(TweenMax.to(el, this.fluidbook.settings.linkBlinkTime, { delay: d, opacity: 0, onComplete: _complete @@ -617,7 +617,7 @@ FluidbookLinks.prototype = { }); }, 100); - }, parseFloat(this.fluidbook.datas.inlineSlideshowDuration) * 1000)); + }, parseFloat(this.fluidbook.settings.inlineSlideshowDuration) * 1000)); } , diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js index 207eb07c..8f4c3ecf 100644 --- a/js/libs/fluidbook/fluidbook.loader.js +++ b/js/libs/fluidbook/fluidbook.loader.js @@ -24,7 +24,7 @@ FluidbookLoader.prototype = { }, getPageDimensions: function (page, width) { - var dim = this.fluidbook.datas.pagesDimensions[page]; + var dim = this.fluidbook.settings.pagesDimensions[page]; if (dim === undefined) { } @@ -40,10 +40,10 @@ FluidbookLoader.prototype = { getVersionToLoad: function (page) { if (this.fluidbook.vectorTexts) { - if (this.fluidbook.datas.vectorPages.indexOf(page) >= 0) { + if (this.fluidbook.settings.vectorPages.indexOf(page) >= 0) { return 'vector'; } - if (this.fluidbook.datas.rasterizePages.indexOf(page) === -1) { + if (this.fluidbook.settings.rasterizePages.indexOf(page) === -1) { return 'textasvector'; } } @@ -265,7 +265,7 @@ FluidbookLoader.prototype = { } }, loadPage: function (pageNr, doublePage, position, callback) { - if (pageNr <= 0 || pageNr > this.fluidbook.datas.pages) { + if (pageNr <= 0 || pageNr > this.fluidbook.settings.pages) { callback(); return; } @@ -298,7 +298,7 @@ FluidbookLoader.prototype = { } $(page).children(".shade").html(this.loadPageShade(position)); - $(page).children('.clinks').html(this.fluidbook.datas.clinks[pageNr]); + $(page).children('.clinks').html(this.fluidbook.settings.clinks[pageNr]); callback(); return; } @@ -315,17 +315,17 @@ FluidbookLoader.prototype = { $(page).addClass(position); shade = 'shade' + position; - if ($this.fluidbook.datas.pageReflection) { + if ($this.fluidbook.settings.pageReflection) { shade += '-reflet'; } shade += '.png'; - $(page).children('.clinks').html($this.fluidbook.datas.clinks[pageNr]); + $(page).children('.clinks').html($this.fluidbook.settings.clinks[pageNr]); $(page).children(".shade").html($this.loadPageShade(position)); callback(); }); }, loadPageShade: function (position) { - return this.loadImage('images/shadows/pages/' + position + '.png', this.fluidbook.datas.width / 4, this.fluidbook.datas.height); + return this.loadImage('images/shadows/pages/' + position + '.png', this.fluidbook.settings.width / 4, this.fluidbook.settings.height); }, loadLeftPage: function (page, doublePage, callback) { if (page > 0 && page <= this.fluidbook.contentlock.getMaxPage()) { @@ -373,7 +373,7 @@ FluidbookLoader.prototype = { } }, _loadBackground: function (page, callback) { - if (page <= 0 || page > this.fluidbook.datas.pages) { + if (page <= 0 || page > this.fluidbook.settings.pages) { callback(); return; } @@ -391,7 +391,7 @@ FluidbookLoader.prototype = { } }, __loadBackground: function (page, callback) { - if (page <= 0 || page > this.fluidbook.datas.pages) { + if (page <= 0 || page > this.fluidbook.settings.pages) { callback(); return; } @@ -403,7 +403,7 @@ FluidbookLoader.prototype = { this.backgrounds[page] = this.loadImage(url, null, null, null, page, callback); }, loadTexture: function (page, callback) { - if (page <= 0 || page > this.fluidbook.datas.pages) { + if (page <= 0 || page > this.fluidbook.settings.pages) { callback(); return; } @@ -420,7 +420,7 @@ FluidbookLoader.prototype = { }, _loadTexture: function (page, callback) { - if (page <= 0 || page > this.fluidbook.datas.pages) { + if (page <= 0 || page > this.fluidbook.settings.pages) { callback(); return; } @@ -433,8 +433,8 @@ FluidbookLoader.prototype = { var ctx = c.getContext("2d"); ctx.clearRect(0, 0, d, d); - var wr = d / $this.fluidbook.datas.width; - var hr = d / $this.fluidbook.datas.height; + var wr = d / $this.fluidbook.settings.width; + var hr = d / $this.fluidbook.settings.height; // Draw background if (this.backgrounds[page] !== undefined && this.backgrounds[page] !== null) { @@ -458,7 +458,7 @@ FluidbookLoader.prototype = { } // Draw content links - var clinks = this.fluidbook.datas.clinks[page]; + var clinks = this.fluidbook.settings.clinks[page]; if (clinks !== '') { $("body").append(''); $("#texture_clinks .contentLink").each(function () { @@ -478,7 +478,7 @@ FluidbookLoader.prototype = { } // Draw the shadow if necessary - if (this.fluidbook.datas.shadeAlpha > 0) { + if (this.fluidbook.settings.shadeAlpha > 0) { var sw = d * .25; var s, x; if (page % 2 === 0) { @@ -490,7 +490,7 @@ FluidbookLoader.prototype = { s = this.shadeRight; x = 0; } - ctx.globalAlpha = 2 * this.fluidbook.datas.shadeAlpha / 100; + ctx.globalAlpha = 2 * this.fluidbook.settings.shadeAlpha / 100; ctx.drawImage(s.get(0), x, 0, sw, d); ctx.globalAlpha = 1; } @@ -516,7 +516,7 @@ FluidbookLoader.prototype = { }, loadTexts: function (pageNr, callback) { - if (pageNr <= 0 || pageNr > this.fluidbook.datas.pages) { + if (pageNr <= 0 || pageNr > this.fluidbook.settings.pages) { callback(); return; } @@ -538,7 +538,7 @@ FluidbookLoader.prototype = { } }, _loadTexts: function (pageNr, callback) { - if (pageNr <= 0 || pageNr > this.fluidbook.datas.pages) { + if (pageNr <= 0 || pageNr > this.fluidbook.settings.pages) { callback(); return; } @@ -558,7 +558,7 @@ FluidbookLoader.prototype = { }, checkLoadedThumbs: function () { - var res = this.loadedThumbnails.length === this.fluidbook.datas.pages; + var res = this.loadedThumbnails.length === this.fluidbook.settings.pages; return res; }, @@ -573,7 +573,7 @@ FluidbookLoader.prototype = { var cb = function () { }; - for (var i = 1; i <= this.fluidbook.datas.pages; i++) { + for (var i = 1; i <= this.fluidbook.settings.pages; i++) { this.loadThumb(i, cb); } }, @@ -587,7 +587,7 @@ FluidbookLoader.prototype = { }, _loadThumb: function (pageNr, callback) { - if (pageNr <= 0 || pageNr > this.fluidbook.datas.pages) { + if (pageNr <= 0 || pageNr > this.fluidbook.settings.pages) { callback(); return; } diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js index 0f35f008..b7a92808 100644 --- a/js/libs/fluidbook/fluidbook.menu.js +++ b/js/libs/fluidbook/fluidbook.menu.js @@ -17,7 +17,7 @@ FluidbookMenu.prototype = { return false; }); - if (this.fluidbook.datas.displayChaptersAtStart) { + if (this.fluidbook.settings.displayChaptersAtStart) { $(this.fluidbook).on('fluidbook.splash.hide', function () { $this.openView('chapters', '', '', function () { @@ -157,8 +157,8 @@ FluidbookMenu.prototype = { var links = ''; var animateLinks = false; var uid = $(a).closest('[data-id]').data('id'); - if (this.fluidbook.datas.links['link_' + uid] !== undefined) { - links = '
' + this.fluidbook.datas.links['link_' + uid] + '
'; + if (this.fluidbook.settings.links['link_' + uid] !== undefined) { + links = '
' + this.fluidbook.settings.links['link_' + uid] + '
'; animateLinks = true; } view += '
'; @@ -301,7 +301,7 @@ FluidbookMenu.prototype = { } else if (service == 'vimeo') { view += ''; } else if (service == 'brightcove') { - view += '' + view += '' } view += '
'; $("#view").append('
' + view + '
'); @@ -320,17 +320,17 @@ FluidbookMenu.prototype = { Object.keys(this.fluidbook.l10n.multilang).forEach(function (langCode) { var v = this.fluidbook.l10n.multilang[langCode]; var url = v.url; - if (url.substr(0, 3) == '../' && !$this.fluidbook.datas.alwaysHTML5 && !$this.fluidbook.datas.standalone && !$this.fluidbook.support.offline) { + if (url.substr(0, 3) == '../' && !$this.fluidbook.settings.alwaysHTML5 && !$this.fluidbook.settings.standalone && !$this.fluidbook.support.offline) { url = '../' + url; } - /*'datas' => array(__('Langue') => 'lang', + /*'settings' => array(__('Langue') => 'lang', __('Langue') . ' (' . __('Pays') . ')' => 'lang_country', __('Pays') . ' (' . __('Langue') . ')' => 'country_lang'));*/ var name = $this.fluidbook.l10n.getLanguageName(langCode); var c = ''; - if ($this.fluidbook.datas.phonegap) { + if ($this.fluidbook.settings.phonegap) { view += '
  • ' + name + '' + name + '
    • '; } else { view += '
  • ' + name + '' + name + '
    • '; @@ -409,13 +409,13 @@ FluidbookMenu.prototype = { } }, openChapters: function (submenu, callback) { - if (this.fluidbook.datas.externalChaptersHTML != '') { + if (this.fluidbook.settings.externalChaptersHTML != '') { this.openExternalChapters(callback); return; } if (this.fluidbook.chapters == undefined) { - this.fluidbook.chapters = new FluidbookChapters(this.fluidbook, this.fluidbook.datas.chapters); + this.fluidbook.chapters = new FluidbookChapters(this.fluidbook, this.fluidbook.settings.chapters); } if (submenu == undefined) { @@ -426,11 +426,11 @@ FluidbookMenu.prototype = { var menuId = 'mview-chapters-' + v.sub; var c = ''; - if (this.fluidbook.datas.chaptersCaptionDisplay === false) { + if (this.fluidbook.settings.chaptersCaptionDisplay === false) { c += ' h0'; } var view = '
    ' + this.closeButton(); - if (this.fluidbook.datas.chaptersCaptionDisplay !== false) { + if (this.fluidbook.settings.chaptersCaptionDisplay !== false) { view += '

    ' + v.title + '

    '; } @@ -454,7 +454,7 @@ FluidbookMenu.prototype = { openExternalChapters: function (callback) { var view = '
    ' + this.closeButton() + '
    '; view += '
    '; - view += ''; + view += ''; view += '
    '; var read = ' data-readmode="1"'; @@ -469,7 +469,7 @@ FluidbookMenu.prototype = { }, openArchives: function (title, callback) { var archives = '
    ' + this.closeButton() + '

    ' + title + '

    '; - archives += '
    ' + this.fluidbook.datas.links.archives + '
    '; + archives += '
    ' + this.fluidbook.settings.links.archives + '
    '; $("#view").append('
    ' + archives + '
    '); if (callback != undefined) { callback(); @@ -596,29 +596,29 @@ FluidbookMenu.prototype = { switch (m.data('menu')) { case 'chapters': - hasCaption = this.fluidbook.datas.chaptersCaptionDisplay !== false; - this.fluidbook.datas.chaptersColumns = Math.max(1, Math.min(6, this.fluidbook.datas.chaptersColumns)); - if (this.fluidbook.datas.chaptersCascade) { - this.fluidbook.datas.chaptersColumns = 1; + hasCaption = this.fluidbook.settings.chaptersCaptionDisplay !== false; + this.fluidbook.settings.chaptersColumns = Math.max(1, Math.min(6, this.fluidbook.settings.chaptersColumns)); + if (this.fluidbook.settings.chaptersCascade) { + this.fluidbook.settings.chaptersColumns = 1; } var w; - if (this.fluidbook.datas.chaptersColumns > 1) { - w = this.fluidbook.datas.chaptersColMaxWidth * this.fluidbook.datas.chaptersColumns; + if (this.fluidbook.settings.chaptersColumns > 1) { + w = this.fluidbook.settings.chaptersColMaxWidth * this.fluidbook.settings.chaptersColumns; } else { - w = Math.min(450, this.fluidbook.datas.chaptersColMaxWidth); + w = Math.min(450, this.fluidbook.settings.chaptersColMaxWidth); } fullscreen = (w >= ww * 0.9); if (fullscreen) { w = ww; } - if (this.fluidbook.datas.chaptersCascade) { + if (this.fluidbook.settings.chaptersCascade) { h = hh * 0.8; forceHeight = true; } - if (this.fluidbook.datas.chaptersColumns > 1) { - if (w < this.fluidbook.datas.chaptersColMaxWidth * this.fluidbook.datas.chaptersColumns) { + if (this.fluidbook.settings.chaptersColumns > 1) { + if (w < this.fluidbook.settings.chaptersColMaxWidth * this.fluidbook.settings.chaptersColumns) { $('.mview[data-menu=chapters] ul.chapters').addClass('onecolumn'); } else { $('.mview[data-menu=chapters] ul.chapters').removeClass('onecolumn'); @@ -627,14 +627,14 @@ FluidbookMenu.prototype = { break; case 'text': - w = parseInt(this.fluidbook.datas.textPopupWidth); + w = parseInt(this.fluidbook.settings.textPopupWidth); fullscreen = (w >= ww * 0.9); break; case 'index': var indexWidth = Math.floor(ww / 230) * 230; $(".indexViewHolder").css('width', indexWidth); if (this.fluidbook.mobilefirst.enabled) { - var cw = 10 + 130 * this.fluidbook.datas.pages; + var cw = 10 + 130 * this.fluidbook.settings.pages; fullscreen = (cw >= ww * 0.9); if (!fullscreen) { w = Math.max(400, cw + 30); @@ -651,8 +651,8 @@ FluidbookMenu.prototype = { break; case 'iframe': w = ww * 0.8; - if (parseInt(this.fluidbook.datas.iframePopupMaxWidth) > 0) { - w = Math.min(w, parseInt(this.fluidbook.datas.iframePopupMaxWidth)); + if (parseInt(this.fluidbook.settings.iframePopupMaxWidth) > 0) { + w = Math.min(w, parseInt(this.fluidbook.settings.iframePopupMaxWidth)); } h = hh * 0.8; if (ww < 800) { @@ -891,7 +891,7 @@ FluidbookMenu.prototype = { // If the option to print the full brochure is disabled, // we change the print dialogue to a 2 column mode and narrower width - if (!this.fluidbook.datas.printFullBrochure) { + if (!this.fluidbook.settings.printFullBrochure) { w = 560; } if (m.find('.print-dialogue').hasClass('compact')) { @@ -970,7 +970,7 @@ FluidbookMenu.prototype = { }); if ($("#archivesview").length == 1) { - var w = this.fluidbook.datas.filesInfos.archives.width; + var w = this.fluidbook.settings.filesInfos.archives.width; var ratio = $("#archivesview img").width() / w; $("#archivesview .links").transform({scale: [ratio]}); } diff --git a/js/libs/fluidbook/fluidbook.mobilefirst.js b/js/libs/fluidbook/fluidbook.mobilefirst.js index b9251300..26907c12 100644 --- a/js/libs/fluidbook/fluidbook.mobilefirst.js +++ b/js/libs/fluidbook/fluidbook.mobilefirst.js @@ -1,11 +1,11 @@ function FluidbookMobileFirst(fluidbook) { this.fluidbook = fluidbook; this.isScrolling = false; - this.enabled = this.fluidbook.datas.mobileNavigationType === 'mobilefirst'; + this.enabled = this.fluidbook.settings.mobileNavigationType === 'mobilefirst'; this.transitioning = false; this.firstReveal = true; if (this.enabled) { - this.fluidbook.datas.logoHideWhenOverriden = false; + this.fluidbook.settings.logoHideWhenOverriden = false; this.fluidbook.displayOnePage = true; $("#fluidbook").wrap('
    '); this.init(); @@ -39,7 +39,7 @@ FluidbookMobileFirst.prototype = { $("#pages .mf-nav").removeClass('hiddenzoom'); }); - this.fluidbook.datas.soundTheme = ''; + this.fluidbook.settings.soundTheme = ''; }, checkScroll: function () { @@ -158,7 +158,7 @@ FluidbookMobileFirst.prototype = { }, getBookScale: function (aw) { - return Math.min(620, aw) / this.fluidbook.datas.width; + return Math.min(620, aw) / this.fluidbook.settings.width; }, getFooterNavigation: function (page) { @@ -167,7 +167,7 @@ FluidbookMobileFirst.prototype = { if (visibility.previous) { footer += ''; } - footer += '
    ' + page + '/' + this.fluidbook.datas.pages + '
    '; + footer += '
    ' + page + '/' + this.fluidbook.settings.pages + '
    '; if (visibility.next) { footer += ''; } diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js index 8b4d46a2..1861c3c4 100644 --- a/js/libs/fluidbook/fluidbook.nav.js +++ b/js/libs/fluidbook/fluidbook.nav.js @@ -1,6 +1,6 @@ function FluidbookNav(fluidbook) { this.fluidbook = fluidbook; - this._dimensions = this.fluidbook.datas.iconsDimensions; + this._dimensions = this.fluidbook.settings.iconsDimensions; this.menuIsOpen = false; this.chaptersMenuHTML = ''; this.searchHTML = ''; @@ -17,7 +17,7 @@ FluidbookNav.prototype = { initMenu: function () { var $this = this, dir = this.fluidbook.l10n.dir, - inverted = this.fluidbook.datas.invertMenuPosition, + inverted = this.fluidbook.settings.invertMenuPosition, side = ((dir === 'ltr' && inverted) || (dir === 'rtl' && !inverted)) ? 'right' : 'left'; var extensions = ['pagedim-black', 'position-front']; @@ -31,7 +31,7 @@ FluidbookNav.prototype = { // Ref: https://github.com/FrDH/jQuery.mmenu/issues/687#issuecomment-279377172 onClick: { close: function () { - if (fluidbook.datas.phonegap === 'ios') { + if (fluidbook.settings.phonegap === 'ios') { return !$(this).is('#menu_download,#menu_print'); } return true; @@ -249,10 +249,10 @@ FluidbookNav.prototype = { * __('switch on the sound') */ var $this = this, - navOrder = this.fluidbook.datas.navOrder; // Default desktop order, maybe be overridden later + navOrder = this.fluidbook.settings.navOrder; // Default desktop order, maybe be overridden later var v2 = ''; - if (this.fluidbook.datas.iconSet < 15) { + if (this.fluidbook.settings.iconSet < 15) { v2 = ' class="v2"'; } @@ -260,8 +260,8 @@ FluidbookNav.prototype = { if (navType === 'menu') { // Use navOrderH (mobile icon order) if it is set - if (this.fluidbook.datas.navOrderH.length > 0) { - navOrder = this.fluidbook.datas.navOrderH; + if (this.fluidbook.settings.navOrderH.length > 0) { + navOrder = this.fluidbook.settings.navOrderH; } var menuOpener = '' + getSpriteIcon('interface-menu') + '' + this.fluidbook.l10n.__('Menu') + ''; @@ -271,7 +271,7 @@ FluidbookNav.prototype = { $nav.append(''); // Add Search form - var searchElement = (this.fluidbook.datas.search) ? this.getSearch() : ''; + var searchElement = (this.fluidbook.settings.search) ? this.getSearch() : ''; this.searchHTML = ''; // Save for later so it can be injected after MMenu is rendered // Horizontal icon nav @@ -287,8 +287,8 @@ FluidbookNav.prototype = { var forceHome = (window.localStorage.getItem('home') === '1'); if (forceHome) { - if (this.fluidbook.datas.navOrder.indexOf('home') === -1) { - this.fluidbook.datas.navOrder.unshift('home'); + if (this.fluidbook.settings.navOrder.indexOf('home') === -1) { + this.fluidbook.settings.navOrder.unshift('home'); } } } catch (err) { @@ -348,9 +348,9 @@ FluidbookNav.prototype = { var link2 = null; if (icon === 'home' && !skipHome) { - var homeURL = this.fluidbook.datas.home; + var homeURL = this.fluidbook.settings.home; var homeRequireLoader = true; - if (this.fluidbook.datas.home === '%apphome%' || forceHome && DATAS.phonegap) { + if (this.fluidbook.settings.home === '%apphome%' || forceHome && this.fluidbook.settings.phonegap) { homeURL = decodeURIComponent(window.localStorage.getItem('apphome')); } if ($_GET['home'] !== undefined) { @@ -390,21 +390,21 @@ FluidbookNav.prototype = { } else if (icon === 'index') { link = this.addLink(navType, 'nav-index', '#/index', 'index', 'overview', 'overview'); } else if (icon === 'chapters') { - if (!this.fluidbook.datas.displayChaptersIcon) { + if (!this.fluidbook.settings.displayChaptersIcon) { continue; } - if (this.fluidbook.datas.externalChaptersHTML) { + if (this.fluidbook.settings.externalChaptersHTML) { link = this.addLink(navType, 'nav-chapters', '#/chapters', 'chapters', 'chapters', 'chapters'); - } else if (this.fluidbook.datas.chaptersPage !== '') { - link = this.addLink(navType, 'nav-chapters', '#/page/' + this.fluidbook.datas.chaptersPage, 'chapters', 'chapters', 'chapters'); - } else if (this.fluidbook.datas.chapters.length > 0) { + } else if (this.fluidbook.settings.chaptersPage !== '') { + link = this.addLink(navType, 'nav-chapters', '#/page/' + this.fluidbook.settings.chaptersPage, 'chapters', 'chapters', 'chapters'); + } else if (this.fluidbook.settings.chapters.length > 0) { // NOTE: Currently the MMenu breaks when the non-cascading chapter UL HTML is inserted so it will // be opened in a popup for now. Todo: fix this so it works as a sub panel of it's own - if (navType === 'menu' && this.fluidbook.datas.chaptersCascade && !this.fluidbook.datas.displayChaptersPopup) { + if (navType === 'menu' && this.fluidbook.settings.chaptersCascade && !this.fluidbook.settings.displayChaptersPopup) { link = this.addLink(navType, 'nav-chapters', '', 'chapters', 'chapters', 'chapters'); // Get HTML for submenus (appended later) - this.chaptersMenuHTML = this.makeChapterLists(this.fluidbook.datas.chapters); + this.chaptersMenuHTML = this.makeChapterLists(this.fluidbook.settings.chapters); } else { link = this.addLink(navType, 'nav-chapters', '#/chapters', 'chapters', 'chapters', 'chapters'); @@ -414,7 +414,7 @@ FluidbookNav.prototype = { } else if (icon === 'friend') { if (this.fluidbook.share.isEnabled()) { if (navType === 'horizontalNav') { - if (this.fluidbook.datas.share) { + if (this.fluidbook.settings.share) { link = this.addLink(navType, 'nav-share', '#/share', 'share', 'share', 'share'); } } else if (navType === 'menu') { @@ -423,11 +423,11 @@ FluidbookNav.prototype = { } } - } else if (icon === 'bookmark' && this.fluidbook.datas.bookmark) { + } else if (icon === 'bookmark' && this.fluidbook.settings.bookmark) { link = this.addLink(navType, 'nav-bookmarks', '#/bookmark', 'bookmarks', 'bookmarks', 'bookmarks'); - } else if (icon === 'pdf' && this.fluidbook.datas.pdf) { + } else if (icon === 'pdf' && this.fluidbook.settings.pdf) { link = this.addLink(navType, 'nav-download', '#', 'download', 'download', 'download'); - } else if (icon === 'print' && this.fluidbook.datas.print) { + } else if (icon === 'print' && this.fluidbook.settings.print) { link = this.addLink(navType, 'nav-print', '#', 'print', 'print', 'print'); } else if (icon === 'basket' && this.fluidbook.cart !== undefined && this.fluidbook.cart.enabled) { link = this.addLink(navType, 'nav-basket', '#/cart', 'cart', 'basket', 'basket'); @@ -453,10 +453,10 @@ FluidbookNav.prototype = { // Note: the "!" at the beginning of the title/help parameters means that we don't want these strings translated link = this.addLink(navType, 'nav-locales', '#/locales', 'locales', '!' + this.fluidbook.l10n.getCurrentLanguageName(), '!Select Language'); } else if (icon === 'archives') { - if (this.fluidbook.datas.archivesLink !== '') { - link = this.addLink(navType, 'nav-archives', this.fluidbook.datas.archivesLink, 'archives', '!' + this.fluidbook.datas.archivesLabel, '!' + this.fluidbook.datas.archivesLabel); - } else if (this.fluidbook.datas.externalArchives !== '') { - link = this.addLink(navType, 'nav-archives', '#/archives', 'archives', '!' + this.fluidbook.datas.archivesLabel, '!' + this.fluidbook.datas.archivesLabel); + if (this.fluidbook.settings.archivesLink !== '') { + link = this.addLink(navType, 'nav-archives', this.fluidbook.settings.archivesLink, 'archives', '!' + this.fluidbook.settings.archivesLabel, '!' + this.fluidbook.settings.archivesLabel); + } else if (this.fluidbook.settings.externalArchives !== '') { + link = this.addLink(navType, 'nav-archives', '#/archives', 'archives', '!' + this.fluidbook.settings.archivesLabel, '!' + this.fluidbook.settings.archivesLabel); } } else if (icon === 'help') { @@ -466,7 +466,7 @@ FluidbookNav.prototype = { link = this.addLink(navType, 'nav-zoomin', '#', 'zoomin', 'zoom in', 'zoom in'); link = this.addLink(navType, 'nav-zoomout', '#', 'zoomout', 'zoom out', 'zoom out'); - } else if (icon === 'fullscreen' && this.fluidbook.support.fullscreen && !DATAS.phonegap) { + } else if (icon === 'fullscreen' && this.fluidbook.support.fullscreen && !this.fluidbook.settings.phonegap) { link = this.addLink(navType, 'nav-' + icon, '#', icon, 'full screen', 'switch between fullscreen and normal'); } else if (icon === 'sound' && this.fluidbook.sound.enabled) { @@ -475,7 +475,7 @@ FluidbookNav.prototype = { } else if (icon === 'search') { // Only the horizontal icon menu has the search icon, which opens the main menu - if (this.fluidbook.datas.search && navType === 'horizontalNav') { + if (this.fluidbook.settings.search && navType === 'horizontalNav') { link = this.addLink(navType, 'nav-search', '#', 'searchIcon', 'search', 'search'); } @@ -488,7 +488,7 @@ FluidbookNav.prototype = { navLinkTarget = ''; // Check to see if navExtraLink is external or not and set target accordingly - if (typeof (this.fluidbook.datas.navExtraLink) === 'string' && this.fluidbook.datas.navExtraLink.lastIndexOf('http', 0) === 0) { + if (typeof (this.fluidbook.settings.navExtraLink) === 'string' && this.fluidbook.settings.navExtraLink.lastIndexOf('http', 0) === 0) { navLinkTarget = ' target="_blank" rel="noopener noreferrer"'; } @@ -497,13 +497,13 @@ FluidbookNav.prototype = { } if (navType === 'horizontalNav') { - if (this.fluidbook.datas.navExtraImage !== '' && this.fluidbook.datas.navExtraLink !== '') { - navExtraImage = this.fluidbook.datas.navExtraImage; - link = ''; + if (this.fluidbook.settings.navExtraImage !== '' && this.fluidbook.settings.navExtraLink !== '') { + navExtraImage = this.fluidbook.settings.navExtraImage; + link = ''; } - } else if (navType === 'menu' && (this.fluidbook.datas.navExtraImage !== '' || this.fluidbook.datas.navExtraImageMobile !== '') && this.fluidbook.datas.navExtraLink !== '') { - navExtraImage = this.fluidbook.datas.navExtraImageMobile || this.fluidbook.datas.navExtraImage; // Fallback to desktop image - link = ' ' + this.fluidbook.datas.navExtraTooltip + ''; + } else if (navType === 'menu' && (this.fluidbook.settings.navExtraImage !== '' || this.fluidbook.settings.navExtraImageMobile !== '') && this.fluidbook.settings.navExtraLink !== '') { + navExtraImage = this.fluidbook.settings.navExtraImageMobile || this.fluidbook.settings.navExtraImage; // Fallback to desktop image + link = ' ' + this.fluidbook.settings.navExtraTooltip + ''; } if (link !== null) { @@ -511,10 +511,10 @@ FluidbookNav.prototype = { } } else if (icon.match(/extra\d/)) { var n = icon.substr(5, 1); - var extraURL = this.fluidbook.datas['navExtraLink' + n]; - var extraIcon = this.fluidbook.datas['navExtraIcon' + n]; - var extraVisibility = this.fluidbook.datas['navExtraVisibility' + n]; - var extraType = this.fluidbook.datas['navExtraType' + n]; + var extraURL = this.fluidbook.settings['navExtraLink' + n]; + var extraIcon = this.fluidbook.settings['navExtraIcon' + n]; + var extraVisibility = this.fluidbook.settings['navExtraVisibility' + n]; + var extraType = this.fluidbook.settings['navExtraType' + n]; if (extraURL === '' || extraIcon === '') { continue; } @@ -566,7 +566,7 @@ FluidbookNav.prototype = { if (extraURL.indexOf('link:') === 0) { var linkId = extraURL.split(':', 2)[1]; var foundLink; - $.each(this.fluidbook.datas.links, function (page, links) { + $.each(this.fluidbook.settings.links, function (page, links) { var l = $('' + links + '').find('[data-id="' + linkId + '"]'); if (l.length === 1) { foundLink = l; @@ -626,7 +626,7 @@ FluidbookNav.prototype = { // If the chapters menu is not cascading, wrap submenu lists in
    s so that MMenu will show them in the same panel - if (!this.fluidbook.datas.chaptersCascade) { + if (!this.fluidbook.settings.chaptersCascade) { // Create a single panel around the chapters $('#chapterList').wrap('
    '); @@ -650,9 +650,9 @@ FluidbookNav.prototype = { $(document).trigger('fluidbook.navigation.ready'); } - if (this.fluidbook.datas.afterSearch !== '' && this.fluidbook.datas.afterSearchDisplayForHTML && this.fluidbook.datas.themeEnableAfterSearch && navType === 'horizontalNav') { + if (this.fluidbook.settings.afterSearch !== '' && this.fluidbook.settings.afterSearchDisplayForHTML && this.fluidbook.settings.themeEnableAfterSearch && navType === 'horizontalNav') { // Use the "afterSearch" image and links set in the theme and link editor - var afterSearchContent = '
    ' + this.fluidbook.loader.getImage('data/images/' + this.fluidbook.datas.afterSearch) + '
    ' + this.fluidbook.datas.links.aftersearch + '
    '; + var afterSearchContent = '
    ' + this.fluidbook.loader.getImage('data/images/' + this.fluidbook.settings.afterSearch) + '
    ' + this.fluidbook.settings.links.aftersearch + '
    '; $nav.after(afterSearchContent); } @@ -679,7 +679,7 @@ FluidbookNav.prototype = { // Share icon $(document).on('click', '.icon-share', function () { - if ($this.fluidbook.datas.phonegap !== 'android') { + if ($this.fluidbook.settings.phonegap !== 'android') { return true; } $this.fluidbook.share.intentShare(); @@ -691,7 +691,7 @@ FluidbookNav.prototype = { event.preventDefault(); // Should we show complex PDF download options? Or just give them the full PDF? - if ($this.fluidbook.datas.pdfComplex && $this.fluidbook.datas.phonegap === false) { + if ($this.fluidbook.settings.pdfComplex && $this.fluidbook.settings.phonegap === false) { $this.fluidbook.menu.openView('download'); } else { $this.fluidbook.downloadPDF($(this)); diff --git a/js/libs/fluidbook/fluidbook.pad.js b/js/libs/fluidbook/fluidbook.pad.js index b4a85609..5d0aba9d 100644 --- a/js/libs/fluidbook/fluidbook.pad.js +++ b/js/libs/fluidbook/fluidbook.pad.js @@ -1,6 +1,6 @@ function FluidbookPad(fluidbook) { this.fluidbook = fluidbook; - this.enabled = this.fluidbook.datas.mobileNavigationType == 'tab'; + this.enabled = this.fluidbook.settings.mobileNavigationType == 'tab'; if (this.enabled) { this.init(); diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js index 342dc578..e8894916 100644 --- a/js/libs/fluidbook/fluidbook.pagetransitions.js +++ b/js/libs/fluidbook/fluidbook.pagetransitions.js @@ -7,7 +7,7 @@ function FluidbookPageTransition(fluidbook) { FluidbookPageTransition.prototype = { init: function () { - if (this.fluidbook.support.transitions3dacc && this.fluidbook.datas.mobileTransitions === 'flip3d') { + if (this.fluidbook.support.transitions3dacc && this.fluidbook.settings.mobileTransitions === 'flip3d') { this.flip3d = new Fluidbook3DFlip(this.fluidbook); } else { this.flip3d = false; @@ -32,7 +32,7 @@ FluidbookPageTransition.prototype = { } else if (type === 'flip3d') { return this.flip3d.animationTime; } else { - return parseFloat(this.fluidbook.datas.mobileTransitionDuration); + return parseFloat(this.fluidbook.settings.mobileTransitionDuration); } }, @@ -46,16 +46,16 @@ FluidbookPageTransition.prototype = { } } if (!this.fluidbook.support.transitions2d || - this.fluidbook.datas.mobileTransitions === 'none') { + this.fluidbook.settings.mobileTransitions === 'none') { return 'immediate'; } if (this.fluidbook.displayOnePage) { return 'portrait'; } - if (!this.fluidbook.support.transitions3d && this.fluidbook.datas.mobileTransitions === 'flip') { + if (!this.fluidbook.support.transitions3d && this.fluidbook.settings.mobileTransitions === 'flip') { return 'slide'; } - if (this.fluidbook.datas.mobileTransitions === 'slide') { + if (this.fluidbook.settings.mobileTransitions === 'slide') { return 'slide'; } if (!this.fluidbook.support.transitions3dacc) { @@ -65,7 +65,7 @@ FluidbookPageTransition.prototype = { return 'flipcss'; } } - if (this.fluidbook.support.transitions3dacc && this.fluidbook.datas.mobileTransitions === 'flip3d') { + if (this.fluidbook.support.transitions3dacc && this.fluidbook.settings.mobileTransitions === 'flip3d') { return 'flip3d'; } return 'flipcss'; @@ -267,7 +267,7 @@ FluidbookPageTransition.prototype = { if (center) { if (newPage <= 1) { res.center = -1; - } else if (this.fluidbook.datas.pages % 2 === 0 && newPage === this.fluidbook.datas.pages) { + } else if (this.fluidbook.settings.pages % 2 === 0 && newPage === this.fluidbook.settings.pages) { res.center = 1; } if (this.fluidbook.l10n.dir === 'rtl') { @@ -281,10 +281,10 @@ FluidbookPageTransition.prototype = { }, centerBookEnabled: function () { - // if (this.fluidbook.support.transitions3dacc && this.fluidbook.datas.mobileTransitions === 'flip3d') { + // if (this.fluidbook.support.transitions3dacc && this.fluidbook.settings.mobileTransitions === 'flip3d') { // return false; // } - return !!this.fluidbook.datas.centerBook && !this.fluidbook.displayOnePage && $('.tabslink').length === 0; + return !!this.fluidbook.settings.centerBook && !this.fluidbook.displayOnePage && $('.tabslink').length === 0; }, centerBook: function (center, animationDuration) { @@ -311,7 +311,7 @@ FluidbookPageTransition.prototype = { $(move).removeClass('animate'); } - var delay = this.fluidbook.support.android ? this.fluidbook.datas.mobileTransitionDuration * 1000 : 10; + var delay = this.fluidbook.support.android ? this.fluidbook.settings.mobileTransitionDuration * 1000 : 10; setTimeout(function () { move.transform({translateX: left + 'px'}); }, delay); @@ -408,7 +408,7 @@ FluidbookPageTransition.prototype = { this.fluidbook.hideLoader(); this.fluidbook.hideUnnecessaryButtons(page); - var animationDuration = transition <= 1 ? 0 : parseFloat(this.fluidbook.datas.mobileTransitionDuration); + var animationDuration = transition <= 1 ? 0 : parseFloat(this.fluidbook.settings.mobileTransitionDuration); this.fluidbook.updateShadows(page, animationDuration); this.centerBook(turning.center, animationDuration); $("#pagesnumbers").addClass('hidden'); @@ -453,7 +453,7 @@ FluidbookPageTransition.prototype = { $("#nextDoublePage").remove(); if (this.fluidbook.pad.enabled) { - if (this.fluidbook.currentPage == this.fluidbook.datas.pages) { + if (this.fluidbook.currentPage == this.fluidbook.settings.pages) { $("#down").css('opacity', 0); } else { $("#down").css('opacity', 1); diff --git a/js/libs/fluidbook/fluidbook.print.js b/js/libs/fluidbook/fluidbook.print.js index 6a47b70f..030ecb4f 100644 --- a/js/libs/fluidbook/fluidbook.print.js +++ b/js/libs/fluidbook/fluidbook.print.js @@ -17,7 +17,7 @@ FluidbookPrint.prototype = { var element = $(this); var mode = element.data('mode'); // Either 'print' or 'download' var print = (mode === 'print'); - var dynamicPDF = 'https://workshop.fluidbook.com/s/' + (print ? 'ep' : 'e') + '/' + $this.fluidbook.datas.cid + '/'; + var dynamicPDF = 'https://workshop.fluidbook.com/s/' + (print ? 'ep' : 'e') + '/' + $this.fluidbook.settings.cid + '/'; var leftPageNumber = $this.fluidbook.getPhysicalPageNumberOfSide('left'); var rightPageNumber = $this.fluidbook.getPhysicalPageNumberOfSide('right'); var choice = $('input[name="pageChoice"]:checked').val(); @@ -45,7 +45,7 @@ FluidbookPrint.prototype = { if (isNaN(rangeStart) || isNaN(rangeEnd) || (rangeStart < 1) || - (rangeEnd > $this.fluidbook.datas.pages) || + (rangeEnd > $this.fluidbook.settings.pages) || (rangeStart > rangeEnd) ) { alert(__('Invalid page range. Please try again.')); @@ -84,7 +84,7 @@ FluidbookPrint.prototype = { this.leftPageNumber = this.fluidbook.getPhysicalPageNumberOfSide('left'); this.rightPageNumber = this.fluidbook.getPhysicalPageNumberOfSide('right'); this.isFirstPage = (this.fluidbook.currentPage === 0); - this.isLastPage = (this.fluidbook.currentPage === this.fluidbook.datas.pages); + this.isLastPage = (this.fluidbook.currentPage === this.fluidbook.settings.pages); this.isSinglePageMode = (this.fluidbook.resize.orientation === 'portrait'); this.buttonLabels = { 'print': __('print'), @@ -120,7 +120,7 @@ FluidbookPrint.prototype = { } // Full Brochure - if (this.fluidbook.datas.printFullBrochure) { + if (this.fluidbook.settings.printFullBrochure) { view += '
    '; if (!this.compact) { view += '