From 95e61100f2eac7d677753a89a918d86d00dd4d64 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 20 Nov 2018 20:02:02 +0100 Subject: [PATCH] wip #2358 @2 --- js/libs/fluidbook/fluidbook.resize.js | 20 ++++++++++++++++++++ js/libs/fluidbook/fluidbook.support.js | 2 +- js/libs/scorm/scorm.js | 6 +++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js index 96ec40f7..d2a3aa3b 100644 --- a/js/libs/fluidbook/fluidbook.resize.js +++ b/js/libs/fluidbook/fluidbook.resize.js @@ -69,7 +69,27 @@ FluidbookResize.prototype = { setTimeout(resize, 3000); }); } + + if (this.fluidbook.support.IE > 9) { + this.watchForResize(); + } + }, + + watchForResize: function () { + // from http://stackoverflow.com/questions/1248081/get-the-browser-viewport-dimensions-with-javascript + var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0); + var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0); + + if ((w !== this.ww) || (h !== this.hh)) { + resize(); + } + + var $this=this; + window.setTimeout(function(){ + $this.watchForResize(); + }, 1000); }, + resize: function (init, forceOrientation) { if (init == undefined || init == null) { init = false; diff --git a/js/libs/fluidbook/fluidbook.support.js b/js/libs/fluidbook/fluidbook.support.js index b9a7233f..dd76b1d6 100644 --- a/js/libs/fluidbook/fluidbook.support.js +++ b/js/libs/fluidbook/fluidbook.support.js @@ -108,7 +108,7 @@ FluidbookSupport.prototype = { var $this = this; if (!isMobile(false)) { - $(window).resize(function () { + $(window).on('resize', function () { resize(); }); } else { diff --git a/js/libs/scorm/scorm.js b/js/libs/scorm/scorm.js index 3a39dd03..e298400d 100644 --- a/js/libs/scorm/scorm.js +++ b/js/libs/scorm/scorm.js @@ -34,7 +34,11 @@ function initScorm() { } console.log('init scorm'); SCORM_INITED = true; - pipwerks.SCORM.init(); + try { + pipwerks.SCORM.init(); + }catch (e) { + + } setScormValue('exit', 'suspend'); startScormTimer(); -- 2.39.5