wip #3272 @0:40

diff --git a/js/libs/fluidbook/fluidbook.share.js b/js/libs/fluidbook/fluidbook.share.js
index 75673b3050009b55441435a06fc162917cbbf3bd..26abcd5b3825f25a3593a67406b543675254a3bc 100644 (file)
--- a/js/libs/fluidbook/fluidbook.share.js
+++ b/js/libs/fluidbook/fluidbook.share.js
@@ -54,14 +54,19 @@ FluidbookShare.prototype = {
         return this.fluidbook.datas.share && this.getShareURL('') !== false;
     },
 
-    getFluidbookURL: function () {
+    getFluidbookURL: function (withPage) {
         var l = window.location.toString();
         if (this.fluidbook.datas.restrictPrintDownload !== "") {
             l = l.replace('?' + this.fluidbook.datas.restrictPrintDownload, '');
             l = l.replace(this.fluidbook.datas.restrictPrintDownload, '');
         }
         var e = l.split("#");
-        return e[0];
+
+        var res = e[0];
+        if (withPage === true) {
+            res += '#/page/' + this.fluidbook.currentPage
+        }
+        return res;
     },
 
     getShareURL: function (url) {

diff --git a/js/libs/fluidbook/links/fluidbook.links.zoom.js b/js/libs/fluidbook/links/fluidbook.links.zoom.js
index fecd13f0e7b22db54aa594c8d648c0d937140163..5bdcbd75246f34831f534235146c45e24a422abe 100644 (file)
--- a/js/libs/fluidbook/links/fluidbook.links.zoom.js
+++ b/js/libs/fluidbook/links/fluidbook.links.zoom.js
@@ -144,7 +144,13 @@ FluidbookLinksZoom.prototype = {
             if ($groupWrapper.find('.zoomPopupClose').length === 0) {
                 var menu = '<div id="zoomPopupMenuWrapper"><div id="zoomPopupMenu">';
                 if (zoomLink.data('shareurl') !== undefined && zoomLink.data('shareurl') !== '') {
-                    menu += '<a href="#" class="button nolabel" data-tooltip="' + this.fluidbook.l10n.__('share') + '" data-action="share" data-extra="' + zoomLink.data('shareurl') + '" data-context="product">' + getSpriteIcon('nav-share') + '</a>';
+                    var shareURL;
+                    if (this.fluidbook.datas.product_share_link === 'product') {
+                        shareURL = zoomLink.data('shareurl');
+                    } else if (this.fluidbook.datas.product_share_link === 'page') {
+                        shareURL = this.fluidbook.share.getFluidbookURL(true);
+                    }
+                    menu += '<a href="#" class="button nolabel" data-tooltip="' + this.fluidbook.l10n.__('share') + '" data-action="share" data-extra="' + shareURL + '" data-context="product">' + getSpriteIcon('nav-share') + '</a>';
                 }
                 if (zoomLink.data('extra-1') !== undefined) {
                     var label = this.fluidbook.datas.product_zoom_label_2;