wip #2190 @0.5

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index c704aa3252dd2c1fbcf398e3e82aacc7c1efae45..85a38b2a8731e5a2e49c051fc612847022a7e245 100644 (file)
--- 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 7225536b1237c7c765c0f60de90642dec9810e35..86c10deae7b4417803e357d0b11c65427a1db272 100644 (file)
--- 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 67dec8f62f3230cc3251bbb9e626ac333de96129..bbed22fb6de002c7e9ebe09f6ade05b671bd16ab 100644 (file)
--- 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 {