(no commit message)

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 76007dbb480d811f256c0b976863053882667e77..7c730cbc0186058ee84be930e705d525c1886f41 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -201,7 +201,7 @@ Fluidbook.prototype = {
 \r
                var $this = this;\r
                if (this.datas.linkBlinkTime > 0) {\r
-                       //this.animateLinks();\r
+                       ///this.animateLinks();\r
                }\r
                setTimeout(function() {\r
                        $this.initVideos();\r

diff --git a/js/libs/fluidbook/fluidbook.support.js b/js/libs/fluidbook/fluidbook.support.js
index 4e366c12a2fc1af8507861a7ae9529033fba9509..63397b0fb64a3776faf58c125f781fa2f9a7868e 100644 (file)
--- 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 f377d6dc49dbd071dc6da8e75aaa8275b0bbcb94..41c76bef34b034193cd97facdb299f2f8a89ad5f 100644 (file)
--- 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;