]> _ Git - fluidbook-html5.git/commitdiff
(no commit message)
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 1 Oct 2013 08:55:39 +0000 (08:55 +0000)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 1 Oct 2013 08:55:39 +0000 (08:55 +0000)
js/libs/fluidbook/fluidbook.js
js/libs/gal/gal.filesystem.js
js/libs/gal/gal.js
js/main.js

index 75cef2603a4c54fdb21a50338a9dbf78e68b1b23..849abbe714b20888236656bd9a0e5d4e67be7d87 100644 (file)
@@ -95,17 +95,18 @@ Fluidbook.prototype = {
                });\r
        },\r
        hideSplash: function() {\r
+               console.log('hide splash');\r
                if ($("#splash").length == 0) {\r
                        return;\r
                }\r
                var $this = this;\r
                setTimeout(function() {\r
+                       $this._hideSplash();\r
                        try {\r
                                navigator.splashscreen.hide();\r
                        } catch (err) {\r
 \r
                        }\r
-                       $this._hideSplash();\r
                }, 3000);\r
        },\r
        _hideSplash: function() {\r
index 47e1fa5007c8337670cdee52971cd7c97e5521e9..2bf629a19c81107a3a59255814e25c4c77d5e20f 100644 (file)
                        that.regenerate(callback);
                };
 
-               console.log('fs init');
-
                // Callback when the filesystem API has granted quota
                var quotaCallback = function(grantedBytes) {
                        var persistent = LocalFileSystem.PERSISTENT;
                var that = this;
                // And then recreate it
                var fs = this.fs;
-
-               console.log('regenerate');
-
                createDir_(fs.root, ROOT_DIR.split('/'), function(res) {
                        // Create a directory for the root of the GAL
                        fs.root.getDirectory(ROOT_DIR, {create: true}, function(dirEntry) {
                                that.root = dirEntry;
-                               console.log('root created');
                                callback();
                        }, onError);
                });
index e073ea2e9ace3aab0bf4138473bf4bbe82079a4c..21b48e145bc2371022fb63a3b333d0ce52d0c813 100644 (file)
                var that = this;
                // Start by downloading the first bundle, then download subsequent ones.
                (function loop(bundleIndex) {
-                       console.log(bundleIndex);
                        if (bundleIndex == that.bundleOrder.length) {
                                // We're done downloading stuff!
                                return;
index c67cae5be762ae4f55420d72b044e2586f394888..6c32b80e26a0a2a601adb9057db19718c5f3f910 100644 (file)
@@ -81,22 +81,17 @@ function onDeviceReady() {
 
        }
 
-       console.log('cordova ready');
-       console.log(fsprefix);
-       console.log(manifest);
-
        if (navigator.onLine && manifest) {
                var readyToLoad = false;
                var finishedLoading = false;
                gal = new GameAssetLoader(JSON.parse(manifest), fsprefix);
-               console.log(gal);
                gal.init(function() {
-                       console.log('gal inited');
                        startAfterLoading = true;
                        init();
                });
 
                gal.onLoaded(function(info) {
+                       console.log('loaded ' + info.bundleName);
                        $(window).trigger('GALBundleLoaded', [info]);
                });
 
@@ -126,10 +121,7 @@ function onDeviceReady() {
                        } catch (err) {
 
                        }
-
-
                });
-               console.log('gal waiting...');
        } else {
                init();
        }