wip #3674 @1

diff --git a/js/libs/fluidbook/fluidbook.share.js b/js/libs/fluidbook/fluidbook.share.js
index 2d39da30ca1b2361031774d7aed9e31b1c974a7a..2b830081a7509c5ce36d53a610d6eaeaf0d326b1 100644 (file)
--- 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 8ba527c6af3a7cbf2acb2ed09b10eafa43288c6c..338d1dbb4db3c752a85679f588b2ee0b58060431 100644 (file)
--- 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];