From 2d83c6d2c6b361f8cdb024bceb733dd41adcf414 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 17 Oct 2013 14:25:43 +0000 Subject: [PATCH] --- js/libs/fluidbook/fluidbook.js | 2 +- js/libs/fluidbook/fluidbook.support.js | 6 +++++- js/main.js | 10 ++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js index 76007dbb..7c730cbc 100644 --- a/js/libs/fluidbook/fluidbook.js +++ b/js/libs/fluidbook/fluidbook.js @@ -201,7 +201,7 @@ Fluidbook.prototype = { var $this = this; if (this.datas.linkBlinkTime > 0) { - //this.animateLinks(); + ///this.animateLinks(); } setTimeout(function() { $this.initVideos(); diff --git a/js/libs/fluidbook/fluidbook.support.js b/js/libs/fluidbook/fluidbook.support.js index 4e366c12..63397b0f 100644 --- a/js/libs/fluidbook/fluidbook.support.js +++ b/js/libs/fluidbook/fluidbook.support.js @@ -10,7 +10,11 @@ function FluidbookSupport(fluidbook) { this.transitionendevent = null; - this.resolution = Modernizr.mq('(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)') ? this.fluidbook.datas.retinaResolution : 150; + if (window.resolution == 'auto') { + this.resolution = Modernizr.mq('(-webkit-min-device-pixel-ratio: 2)') ? this.fluidbook.datas.retinaResolution : 150; + } else { + this.resolution = window.resolution; + } this.isMobile = isMobile(); this.SVG = Modernizr.svg && this.fluidbook.datas.mobileIconVector; diff --git a/js/main.js b/js/main.js index f377d6dc..41c76bef 100644 --- a/js/main.js +++ b/js/main.js @@ -9,6 +9,7 @@ var longpresstime = undefined; var startAfterLoading = false; var gal = null; var home = window.location.toString(); +var resolution = 'auto'; try { $(function() { @@ -86,6 +87,15 @@ try { } + var collection = JSON.parse(window.localStorage.getItem('collection')); + if (collection.res != undefined && collection.res) { + resolution = collection.res; + } + + if (DATAS.phonegap && !manifest) { + manifest = collection.manifestPub[DATAS.id]; + } + if (navigator.onLine && manifest) { var readyToLoad = false; var finishedLoading = false; -- 2.39.5