From 2c0976827bbfe339ff2cd49aebc36a5e3bf75154 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 22 Aug 2018 15:57:10 +0200 Subject: [PATCH] wip #2190 @0.5 --- js/libs/fluidbook/fluidbook.js | 4 +++- js/libs/fluidbook/fluidbook.links.js | 5 +++++ style/fluidbook.less | 22 +++++++++------------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js index c704aa32..85a38b2a 100644 --- a/js/libs/fluidbook/fluidbook.js +++ b/js/libs/fluidbook/fluidbook.js @@ -983,6 +983,7 @@ Fluidbook.prototype = { }); }, + _openFilePhonegap: function (url, e, type) { var $this = this; var types_ios = {pdf: 'com.adobe.pdf'}; @@ -1086,6 +1087,7 @@ Fluidbook.prototype = { $('body').addClass('loading'); } }, + hideLoader: function (delay, force) { if (force == undefined) { force = false; @@ -1101,6 +1103,7 @@ Fluidbook.prototype = { $this._hideLoader(force); }, delay * 1000); }, + _hideLoader: function (force) { if (force == undefined) { force = false; @@ -1116,7 +1119,6 @@ Fluidbook.prototype = { } }, - wopen: function (url, target, options, print) { var win; if (this.support.nwjs) { diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index 7225536b..86c10dea 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -81,6 +81,11 @@ FluidbookLinks.prototype = { return false; }); + $(document).on('click touchend', '.textpopup', function () { + $this.fluidbook.menu.__openView('text', $(this).data('text'), function () { + }); + return false; + }); $(document).on('click touchend', '[data-action]', function () { var map = {'pdf': 'print', 'fullScreen': "fullscreen", 'locales': 'localesContainers', 'basket': 'cart'}; diff --git a/style/fluidbook.less b/style/fluidbook.less index 67dec8f6..bbed22fb 100644 --- a/style/fluidbook.less +++ b/style/fluidbook.less @@ -1164,6 +1164,7 @@ html.ios body.portrait #interface { /* Bookmarks */ .bookmark { + #links & { z-index: 4999; width: @bookmark-corner-size; @@ -1182,6 +1183,7 @@ html.ios body.portrait #interface { right: @bookmark-corner-offset; } } + background-repeat: no-repeat; position: absolute; background-size: cover; @@ -1219,14 +1221,6 @@ html.ios body.portrait #interface { background-image: url("../data/images/bookmark-right-on.svg"); } -//.bookmark.animating { -// -moz-transition: opacity 1s ease-in; -// -webkit-transition: opacity 1s ease-in; -// -o-transition: opacity 1s ease-in; -// -ms-transition: opacity 1s ease-in; -// transition: opacity 1s ease-in; -//} - .landscape .bookmark.left { left: 0px; } @@ -1275,7 +1269,7 @@ html.ios body.portrait #interface { -o-transition: opacity @menutransition, top @menutransition; transition: opacity @menutransition, top @menutransition; - &[data-menu="multimedia"], &[data-menu="webvideo"], &[data-menu="video"], &[data-menu="externalchapters"], &[data-menu="iframe"] { + &[data-menu="multimedia"], &[data-menu="webvideo"], &[data-menu="video"], &[data-menu="externalchapters"], &[data-menu="iframe"], &[data-menu="text"] { .caption { height: 0; padding: 0; @@ -1295,14 +1289,13 @@ html.ios body.portrait #interface { .ps__scrollbar-x-rail, .ps__scrollbar-y-rail { z-index: 4; } - } - &[data-menu="iframe"] { + // Popup with close button outside + &[data-menu="iframe"], &[data-menu="text"] { overflow: visible; a, div { &.button.back { - right: -30px; } } @@ -1315,6 +1308,10 @@ html.ios body.portrait #interface { } } } + } + + &[data-menu="iframe"] { + .iframeContainer, .iframeHolder { height: 100%; @@ -1325,7 +1322,6 @@ html.ios body.portrait #interface { } } - & &[data-menu="externalchapters"] { .caption { a, div { -- 2.39.5