From: Vincent Vanwaelscappel Date: Thu, 25 Jun 2020 14:15:21 +0000 (+0200) Subject: wip #3674 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b496dc6a874bcd14cb80ff966bf4283f1b557cdd;p=fluidbook-html5.git wip #3674 @1 --- diff --git a/js/libs/fluidbook/fluidbook.share.js b/js/libs/fluidbook/fluidbook.share.js index 2d39da30..2b830081 100644 --- a/js/libs/fluidbook/fluidbook.share.js +++ b/js/libs/fluidbook/fluidbook.share.js @@ -79,6 +79,8 @@ FluidbookShare.prototype = { if (this.fluidbook.settings.offlineLink !== '' && this.fluidbook.settings.offlineLink !== 'http://') { res = this.fluidbook.settings.offlineLink; } + } else if ($_GET['hybrid'] !== undefined && $_GET['hybrid'] === '1' && $_GET['from'] !== undefined && $_GET['from']) { + res = decodeURIComponent($_GET['from']); } else { res = this.getFluidbookURL(); } diff --git a/js/libs/fluidbook/fluidbook.utils.js b/js/libs/fluidbook/fluidbook.utils.js index 8ba527c6..338d1dbb 100644 --- a/js/libs/fluidbook/fluidbook.utils.js +++ b/js/libs/fluidbook/fluidbook.utils.js @@ -21,8 +21,8 @@ function isMobile(returnTrueIfTouch) { function parseGet() { var couples = window.location.search.substr(1).split('&'); - var res = new Array(); - var couple = new Array(); + var res = {}; + var couple = []; for (var i = 0; i < couples.length; i++) { couple = couples[i].split('='); res[couple[0]] = couple[1];