From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 5 Jan 2018 19:19:09 +0000 (+0100)
Subject: #1859 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=8f3681bff448d36e6755788c80e3a7c1a10371b1;p=fluidbook-html5.git

#1859 @0.5
---

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 6a0722ea..1fad66fa 100644
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -34,6 +34,9 @@ Fluidbook.prototype = {
         this.loader = new FluidbookLoader(this);
         this.search = new FluidbookSearch(this);
         this.pad = new FluidbookPad(this);
+        if (this.datas.scorm_enable) {
+            this.scorm = new FluidbookScorm(this);
+        }
         this.links = new FluidbookLinks(this);
         this.waiters = [];
         this.viewport = new FluidbookViewport(this);
@@ -50,9 +53,6 @@ Fluidbook.prototype = {
         this.tooltip = new FluidbookTooltip(this);
         this.audiodescription = new FluidbookAudioDescription(this);
         this.sound = new FluidbookSound(this);
-        if (this.datas.scorm_enable) {
-            this.scorm = new FluidbookScorm(this);
-        }
 
         if (this.datas.form == 'bulle') {
             this.form = new FluidbookBulleForm(this);
@@ -1067,11 +1067,13 @@ Fluidbook.prototype = {
             if (this.support.IE == 0) {
                 w = window.open(url, mtarget);
             } else {
-                $(body).append('<a id="wopen" href="' + url + '" target="' + mtarget + '"></a>');
-                $("#wopen").trigger('click');
                 $("#wopen").remove();
+                $('body').append('<a id="wopen" href="' + url + '" target="' + mtarget + '"></a>');
+                $("#wopen").get(0).click();
+                setTimeout(function () {
+                    $("#wopen").remove();
+                }, 200);
             }
-
         } else {
             w = window.open(url, mtarget, options, replace);
         }
diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index 26c89584..a2f72829 100644
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@ -41,6 +41,11 @@ FluidbookLinks.prototype = {
         $(document).on('click', 'a', function () {
             // console.log('click link ');
             // console.log($(this));
+
+            if ($(this).is('#wopen')) {
+                return true;
+            }
+
             var target = $(this).attr('target');
             if (!target) {
                 target = '_self';