From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 7 Jun 2022 14:47:37 +0000 (+0200)
Subject: wait #5309 @0:10
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=98d6365dd1117824d4949709edd49086d10e31d4;p=fluidbook-html5.git

wait #5309 @0:10
---

diff --git a/_index.html b/_index.html
index cf5379e5..78f21d51 100644
--- a/_index.html
+++ b/_index.html
@@ -61,7 +61,7 @@
         <nav id="horizontalNav" role="navigation"></nav>
         <nav id="menu" aria-hidden="true"></nav>
         <div id="search"></div>
-        <a id="logo" href="#" aria-hidden="true" tabindex="-1"></a>
+        <a id="logo" aria-hidden="true" tabindex="-1"></a>
     </header>
     <nav role="navigation" id="interface"></nav>
     <div id="helpView"></div>
diff --git a/js/libs/cube/util.js b/js/libs/cube/util.js
index a4b01d2d..5fc52e81 100644
--- a/js/libs/cube/util.js
+++ b/js/libs/cube/util.js
@@ -357,4 +357,4 @@ window.clearRequestTimeout = function(handle) {
     "undefined" != typeof exports && (exports.sprintf = y, exports.vsprintf = e), "undefined" != typeof window && (window.sprintf = y, window.vsprintf = e, "function" == typeof define && define.amd && define(function () {
         return {sprintf: y, vsprintf: e}
     }))
-}();
\ No newline at end of file
+}();
diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 2149be6c..937fa47f 100644
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -182,6 +182,21 @@ Fluidbook.prototype = {
         }
     },
 
+    initEvents: function () {
+        var $this = this;
+        $(document).on(this.input.clickEvent, '.lazy', function () {
+            return false;
+        });
+
+        if (this.settings.url_link !== '' && this.settings.url_link !== 'http://' && this.settings.url_link !== 'https://') {
+            $("#logo").attr('href', '#');
+            $(document).on(this.input.clickEvent, '#logo', function () {
+                $this.clickLogo();
+                return false;
+            });
+        }
+    },
+
     initSettings: function (settings) {
         this.settings = settings;
         //
@@ -730,10 +745,6 @@ Fluidbook.prototype = {
         return this.physicalToVirtual(physical);
     },
     clickLogo: function () {
-        if (this.settings.url_link == '' || this.settings.url_link == 'http://') {
-            return;
-        }
-
         if (this.settings.url_link.indexOf('#') === 0) {
             window.location.hash = this.settings.url_link;
         } else {
diff --git a/js/libs/fluidbook/fluidbook.share.js b/js/libs/fluidbook/fluidbook.share.js
index d99ef207..1c747f8a 100644
--- a/js/libs/fluidbook/fluidbook.share.js
+++ b/js/libs/fluidbook/fluidbook.share.js
@@ -301,8 +301,7 @@ FluidbookShare.prototype = {
         if (body !== '') {
             mailtoParams.push('body=' + body);
         }
-        var mailto = 'mailto:?' + mailtoParams.join('&');
-        window.location = mailto;
+        window.location = 'mailto:?' + mailtoParams.join('&');
         this.fluidbook.stats.track(5);
     },
 
diff --git a/js/main.js b/js/main.js
index 5ba9e6d4..fab799cc 100644
--- a/js/main.js
+++ b/js/main.js
@@ -305,6 +305,8 @@ try {
             });
         }
 
+
+
         $(window).on('hashchange', function () {
             if (maskHashChange) {
                 return;
@@ -390,11 +392,7 @@ try {
 
         });
 
-        $("#logo").click(clickLogo);
-
-        $(document).on(this.fluidbook.input.clickEvent, '.lazy', function () {
-            return false;
-        });
+        fluidbook.initEvents();
 
         $(document).trigger('fluidbook.ready');
 
@@ -473,11 +471,6 @@ function goPreviousPage(e) {
     return false;
 }
 
-function clickLogo() {
-    fluidbook.clickLogo();
-    return false;
-}
-
 function preloadBackground(page, resolution) {
     fluidbook.preloadBackground(page, resolution);
 }