From 82c632ffa0ec8e03eb03b35f62f732a1a435fa3c Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 8 Jul 2020 19:04:49 +0200 Subject: [PATCH] wip #3764 @4 --- _index.html | 4 +- .../cart/fluidbook.cart.remarkable.js | 4 +- js/libs/fluidbook/fluidbook.articles.js | 4 +- js/libs/fluidbook/fluidbook.bookmarks.js | 4 +- js/libs/fluidbook/fluidbook.menu.js | 109 ++++++++++++------ js/libs/fluidbook/fluidbook.share.js | 6 +- .../fluidbook/forms/fluidbook.form.avery.js | 4 +- .../fluidbook/forms/fluidbook.form.bourbon.js | 4 +- .../fluidbook/links/fluidbook.links.zoomhd.js | 4 +- js/libs/fluidbook/menu/fluidbook.index.js | 4 +- 10 files changed, 91 insertions(+), 56 deletions(-) diff --git a/_index.html b/_index.html index e684d753..8058db41 100644 --- a/_index.html +++ b/_index.html @@ -46,7 +46,7 @@ -
+
'; var read = multimedia.indexOf('r_') == 0 ? ' data-readmode="1"' : ''; - $("#view").append('
' + view + '
'); + read += ' dir="ltr"'; + this.viewWrap(view, multimedia, read) if (animateLinks) { this.fluidbook.links.doAnimateLinks($("#view"), 500); @@ -188,7 +226,7 @@ FluidbookMenu.prototype = { a = this.fluidbook.links.getLinkByHref(href); } var markup = decodeURIComponent($(a).attr('data-iframe')); - var view = '
' + this.closeButton() + '
'; + var view = this.getCaption(); view += '
'; view += markup; view += '
'; @@ -198,7 +236,7 @@ FluidbookMenu.prototype = { maxWidth = ' data-max-width="' + $(a).data('max-width') + '"'; } - $("#view").append('
' + view + '
'); + this.viewWrap(view, 'iframe', maxWidth + ' dir="ltr"'); if (callback != undefined) { callback(); } @@ -220,11 +258,12 @@ FluidbookMenu.prototype = { openVideo: function (video, callback) { var a = $('a[href="#/video/' + video + '"]'); var markup = decodeURIComponent($(a).attr('data-video')); - var view = '
' + this.closeButton() + '
'; + var view = this.getCaption(); view += '
'; view += markup; view += '
'; - $("#view").append('
' + view + '
'); + this.viewWrap(view, 'video'); + this.fluidbook.stats.track(11); this.fluidbook.initVideos(); var $this = this; @@ -243,11 +282,11 @@ FluidbookMenu.prototype = { openSlideshow: function (slideshow, callback) { var a = $('a[href="#/slideshow/' + slideshow + '"]'); var markup = decodeURIComponent($(a).attr('data-slideshow')); - var view = '
' + this.closeButton() + '
'; + var view = this.getCaption(); view += '
'; view += markup; view += '
'; - $("#view").append('
' + view + '
'); + this.viewWrap(view, 'slideshow'); // TODO: check which type should be passed to fluidbook.stats.track() ??? // this.fluidbook.stats.track(11); @@ -279,11 +318,11 @@ FluidbookMenu.prototype = { openAudio: function (audio, callback) { var a = $('a[href="#/audio/' + audio + '"]'); var markup = decodeURIComponent($(a).attr('data-audio')); - var view = '
' + this.closeButton() + '
'; + var view = this.getCaption(); view += '
'; view += markup; view += '
'; - $("#view").append('
' + view + '
'); + this.viewWrap(view, 'audio'); this.fluidbook.stats.track(11); var $this = this; var times = [250, 500, 750, 1000, 1250]; @@ -299,7 +338,7 @@ FluidbookMenu.prototype = { , openWebVideo: function (service, video, callback) { - var view = '
' + this.closeButton() + '
'; + var view = this.getCaption(); view += '
'; if (service == 'youtube') { @@ -312,7 +351,7 @@ FluidbookMenu.prototype = { view += '' } view += '
'; - $("#view").append('
' + view + '
'); + this.viewWrap(view, 'webvideo'); this.fluidbook.stats.track(11); if (callback != undefined) { callback(); @@ -320,7 +359,7 @@ FluidbookMenu.prototype = { } , openLocales: function (p1, p2, callback) { - var view = '
' + this.closeButton() + '

Select language

'; + var view = this.getCaption('Select language'); view += '
'; view += '
    '; var $this = this; @@ -346,7 +385,7 @@ FluidbookMenu.prototype = { }); view += '
'; view += '
'; - $("#view").append('
' + view + '
'); + this.viewWrap(view, 'locales'); if (callback != undefined) { callback(); } @@ -363,7 +402,7 @@ FluidbookMenu.prototype = { // __("you don't have any bookmark. to add a bookmark, please click on the icon in the page corner") //var message = this.fluidbook.l10n.translate("you don't have any bookmark. to add a bookmark, please click on the icon in the page corner") var message = __("you don't have any bookmark. to add a bookmark, please click on the icon in the page corner"); - var view = '
' + this.fluidbook.menu.closeButton() + '

'; + var view = '
' + this.getCaption(); view += '
'; view += '
'; view += '

' + message + '

'; @@ -379,8 +418,7 @@ FluidbookMenu.prototype = { view += ''; view += '
'; view += '
'; - $("#view").append('
' + view + '
'); - + this.viewWrap(view, 'bookmarks-help'); if (callback != undefined) { callback(); @@ -411,7 +449,8 @@ FluidbookMenu.prototype = { } var view = this.fluidbook.bookmarks.getView(title, downloadLabel); - $("#view").append('
' + view + '
'); + this.viewWrap(view, 'bookmarks'); + if (callback != undefined) { callback(); } @@ -437,12 +476,7 @@ FluidbookMenu.prototype = { if (this.fluidbook.settings.chaptersCaptionDisplay === false) { c += ' h0'; } - var view = '
' + this.closeButton(); - if (this.fluidbook.settings.chaptersCaptionDisplay !== false) { - view += '

' + v.title + '

'; - } - - view += '
'; + var view = this.getCaption(this.fluidbook.settings.chaptersCaptionDisplay ? v.title : '', true, c); view += '
'; view += v.view; view += '
'; @@ -452,7 +486,8 @@ FluidbookMenu.prototype = { color = ' c_' + v.color; } - $("#view").append(''); + this.viewWrap(view, 'chapters', 'id="' + menuId + '"', color); + this.fluidbook.chapters.removeItemsAfterMaxPage(); if (callback != undefined) { callback(); @@ -460,13 +495,13 @@ FluidbookMenu.prototype = { this.fluidbook.stats.track(14); }, openExternalChapters: function (callback) { - var view = '
' + this.closeButton() + '
'; + var view = this.getCaption(); view += '
'; view += ''; view += '
'; var read = ' data-readmode="1"'; - $("#view").append('
' + view + '
'); + this.viewWrap(view, 'externalchapters', read + ' dir="ltr"'); if (callback != undefined) { callback(); } @@ -476,9 +511,9 @@ FluidbookMenu.prototype = { this.index.openIndex(title, group, closeAll, callback); }, openArchives: function (title, callback) { - var archives = '
' + this.closeButton() + '

' + title + '

'; + var archives = this.getCaption(title); archives += '
'; - $("#view").append('
' + archives + '
'); + this.viewWrap(archives, 'archives', '', 'archives'); if (callback != undefined) { callback(); } @@ -491,20 +526,20 @@ FluidbookMenu.prototype = { style = styleMatches[1].replace(/\s/g, ''); } text = text.replace(/\([^\<]*)<\/style>/g, ''); - var t = '
' + this.closeButton() + '

'; + var t = this.getCaption(); t += '
' + text + '
'; - $("#view").append('
' + t + '
'); + this.viewWrap(t, 'text'); if (callback != undefined) { callback(); } }, openPrint: function (callback) { - var printDialogue = '
' + this.closeButton() + '

' + __('print') + '

'; + var printDialogue = this.getCaption(__('print')); printDialogue += this.fluidbook.printing.getView(); - $("#view").append('
' + printDialogue + '
'); + this.viewWrap(printDialogue, 'print'); // Auto select first option (the options are dynamic so we can't do it until now) $('.print-dialogue .print-option:first-of-type input[type="radio"]').prop('checked', true); @@ -515,11 +550,10 @@ FluidbookMenu.prototype = { }, openDownload: function (callback) { - var downloadDialogue = '
' + this.closeButton() + '

' + __('download') + '

'; - + var downloadDialogue = this.getCaption(__('download')); downloadDialogue += this.fluidbook.printing.getView('download'); // Reuse print dialogue since they're almost the same - $("#view").append('
' + downloadDialogue + '
'); + this.viewWrap(downloadDialogue, 'download'); // Auto select first option (the options are dynamic so we can't do it until now) // Todo: maybe make this different for downloads? Auto select full brochure option? @@ -575,7 +609,8 @@ FluidbookMenu.prototype = { } if (all) { - $("#main").show(); + $("#view").attr('aria-hidden', 'true'); + $("#main").attr('aria-hidden', 'false').show(); $('body').removeClass('view'); } resize(); diff --git a/js/libs/fluidbook/fluidbook.share.js b/js/libs/fluidbook/fluidbook.share.js index 72adac6f..4be793ae 100644 --- a/js/libs/fluidbook/fluidbook.share.js +++ b/js/libs/fluidbook/fluidbook.share.js @@ -73,7 +73,7 @@ FluidbookShare.prototype = { if (url == undefined || url == 'undefined' || url == null || url == false) { url = ''; } - url=url.toString(); + url = url.toString(); if (url == '') { var res = false; if (this.fluidbook.support.offline || this.fluidbook.settings.phonegap) { @@ -242,12 +242,12 @@ FluidbookShare.prototype = { } - view = '
' + this.fluidbook.menu.closeButton() + '

' + this.fluidbook.l10n.__('share') + '

'; + view = this.fluidbook.menu.getCaption(this.fluidbook.l10n.__('share')); view += '
'; view += this.getShareLinks(false, url, context); view += '
'; - $("#view").append('
' + view + '
'); + this.fluidbook.menu.viewWrap(view,'share'); if (callback != undefined) { callback(); } diff --git a/js/libs/fluidbook/forms/fluidbook.form.avery.js b/js/libs/fluidbook/forms/fluidbook.form.avery.js index 52c2d9ea..2650c3d1 100644 --- a/js/libs/fluidbook/forms/fluidbook.form.avery.js +++ b/js/libs/fluidbook/forms/fluidbook.form.avery.js @@ -83,7 +83,7 @@ FluidbookAveryForm.prototype = { openForm: function (p1, p2, callback) { var $this = this; - var view = '
' + $this.fluidbook.menu.closeButton() + '

' + $this.locale.title + '

'; + var view = this.fluidbook.menu.getCaption($this.locale.title); view += '
'; view += '
'; view += '
'; @@ -129,7 +129,7 @@ FluidbookAveryForm.prototype = { view += ''; view += '
'; - $("#view").append('
' + view + '
'); + this.fluidbook.menu.viewWrap(view,'form','data-form="avery" data-maxwidth="650"'); var options = ['']; $.each(this.fluidbook.settings.countries, function (code, name) { diff --git a/js/libs/fluidbook/forms/fluidbook.form.bourbon.js b/js/libs/fluidbook/forms/fluidbook.form.bourbon.js index ad81b720..30f6cf5d 100644 --- a/js/libs/fluidbook/forms/fluidbook.form.bourbon.js +++ b/js/libs/fluidbook/forms/fluidbook.form.bourbon.js @@ -21,7 +21,7 @@ FluidbookBourbonForm.prototype = { }, openSuggest: function (p1, p2, callback) { - var view = '
' + this.closeButton() + '

Suggest a modification

'; + var view = this.fluidbook.menu.getCaption('Suggest a modification'); view += '
'; view += '
'; view += '
'; @@ -39,7 +39,7 @@ FluidbookBourbonForm.prototype = { view += ''; view += '
'; - $("#view").append('
' + view + '
'); + this.fluidbook.menu.viewWrap(view,'suggest'); callback(); }, diff --git a/js/libs/fluidbook/links/fluidbook.links.zoomhd.js b/js/libs/fluidbook/links/fluidbook.links.zoomhd.js index 2998c476..8463e024 100644 --- a/js/libs/fluidbook/links/fluidbook.links.zoomhd.js +++ b/js/libs/fluidbook/links/fluidbook.links.zoomhd.js @@ -70,11 +70,11 @@ FluidbookLinksZoomHD.prototype = { this.fluidbook.displayLoader(); - view = '
' + this.fluidbook.menu.closeButton() + '
'; + view = this.fluidbook.menu.getCaption(); view += ''; - $("#view").append('
' + view + '
'); + this.fluidbook.menu.viewWrap(view,'zoomhd','data-fullscreen="1" dir="ltr"','h100'); this.element = $("#view").find('.zoomhdScale'); this.image = fluidbook.loader.loadImage('data/links/' + link.to, null, null, null, null, function () { diff --git a/js/libs/fluidbook/menu/fluidbook.index.js b/js/libs/fluidbook/menu/fluidbook.index.js index a6b7163c..5b2adf62 100644 --- a/js/libs/fluidbook/menu/fluidbook.index.js +++ b/js/libs/fluidbook/menu/fluidbook.index.js @@ -36,9 +36,9 @@ FluidbookIndex.prototype = { _openIndex: function (title, group, closeAll, callback) { var c = !closeAll ? ' one' : ''; - var index = '
' + this.fluidbook.menu.closeButton(c) + '

' + title + '

'; + var index = this.fluidbook.menu.getCaption(title); index += this.getView(group); - $("#view").append('
' + index + '
'); + this.fluidbook.menu.viewWrap(index,'index'); // Mark current page var cp = this.fluidbook.currentPage; -- 2.39.5