From 09547bb1a8c5d04a42a656d4ed1147c227c2491c Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 24 Jun 2014 09:13:47 +0000 Subject: [PATCH] --- js/libs/fluidbook/fluidbook.js | 1 - js/libs/fluidbook/fluidbook.loader.js | 1 - js/libs/fluidbook/fluidbook.support.js | 7 ++++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js index aeba36b2..bc9454d5 100644 --- a/js/libs/fluidbook/fluidbook.js +++ b/js/libs/fluidbook/fluidbook.js @@ -75,7 +75,6 @@ Fluidbook.prototype = { if (!this.support.isMobile) { this.desktop = new FluidbookDesktop(this); } - this.initLoading(); }, initLoading: function() { diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js index 35765712..52d595ac 100644 --- a/js/libs/fluidbook/fluidbook.loader.js +++ b/js/libs/fluidbook/fluidbook.loader.js @@ -6,7 +6,6 @@ function FluidbookLoader(fluidbook) { this.toPreload = []; this.numPreload = 6; this.imagesErrors = []; - } FluidbookLoader.prototype = { diff --git a/js/libs/fluidbook/fluidbook.support.js b/js/libs/fluidbook/fluidbook.support.js index 855669e6..9a128f49 100644 --- a/js/libs/fluidbook/fluidbook.support.js +++ b/js/libs/fluidbook/fluidbook.support.js @@ -9,7 +9,12 @@ function FluidbookSupport(fluidbook) { this.transitions3d = Modernizr.csstransforms3d && Modernizr.csstransformspreserve3d && this.transitions2d; this.transitionendevent = null; - this.resolution = 150; + + if (window.resolution == 'auto') { + this.resolution = Modernizr.mq('(-webkit-min-device-pixel-ratio: 2)') ? 300 : 150; + } else { + this.resolution = window.resolution; + } this.isMobile = isMobile(); this.SVG = Modernizr.svg && this.fluidbook.datas.mobileIconVector; -- 2.39.5