From 9c4e8f55f3751dda2dc3590aa119e43a973881a7 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 16 Dec 2019 12:06:41 +0100 Subject: [PATCH] wip #3272 @0:40 --- js/libs/fluidbook/fluidbook.share.js | 9 +++++++-- js/libs/fluidbook/links/fluidbook.links.zoom.js | 8 +++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.share.js b/js/libs/fluidbook/fluidbook.share.js index 75673b30..26abcd5b 100644 --- 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 fecd13f0..5bdcbd75 100644 --- 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 = '
'; if (zoomLink.data('shareurl') !== undefined && zoomLink.data('shareurl') !== '') { - menu += '' + getSpriteIcon('nav-share') + ''; + 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 += '' + getSpriteIcon('nav-share') + ''; } if (zoomLink.data('extra-1') !== undefined) { var label = this.fluidbook.datas.product_zoom_label_2; -- 2.39.5