#474

diff --git a/js/main.js b/js/main.js
index cfce6f38df97a3ede7257342af6d9139bf99a1b5..799a718af3c15f00e18dcdec23681192177f6cee 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -1,3 +1,14 @@
+var DEVICE_READY_BEFORE_JQUERY = false;
+var JQUERY_READY = false;
+document.addEventListener('deviceready', _onDeviceReady, false);
+function _onDeviceReady() {
+    if (JQUERY_READY) {
+        onDeviceReady();
+    } else {
+        DEVICE_READY_BEFORE_JQUERY = true;
+    }
+}
+
 var fluidbook;
 var desktopScale;
 var dektopScaleAmount;
@@ -15,8 +26,10 @@ var FINISHLOADING = false;
 var PLATFORM = 'web';
 var DEVICE_READY = false;
 
+
 try {
     $(function () {
+        JQUERY_READY = true;
         $("#message").hide();
         $("#splash").show();
 
@@ -65,7 +78,7 @@ try {
             cordovaPath = window.localStorage.getItem('cordova');
         }
 
-        document.addEventListener('deviceready', onDeviceReady, false);
+
         document.addEventListener("resume", onAppResume, false);
 
         loadJSLibrary(
@@ -75,12 +88,13 @@ try {
             fb('cordova already loaded');
             cordovaLoaded();
         }
+        if (DEVICE_READY_BEFORE_JQUERY) {
+            onDeviceReady();
+        }
     }
 
     function cordovaLoaded() {
-        setTimeout(function () {
-            onDeviceReady();
-        }, 5000);
+
     }
 
     function onDeviceOffline() {
@@ -109,10 +123,10 @@ try {
             return;
         }
 
-        fb('device ready !');
-
         DEVICE_READY = true;
 
+        fb('device ready !');
+
         document.addEventListener("offline", onDeviceOffline, false);
 
         var manifest;