]> _ Git - fluidbook-html5.git/commitdiff
(no commit message)
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 13 Nov 2013 14:27:08 +0000 (14:27 +0000)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 13 Nov 2013 14:27:08 +0000 (14:27 +0000)
js/libs/fluidbook/fluidbook.loader.js
js/main.js

index a758d0fe214e4b3ecca6ebe2d709259f0f62fc50..ae32a5962b5c1e8f5962cd43c4fbfe38ec6e9ce9 100644 (file)
@@ -210,7 +210,7 @@ FluidbookLoader.prototype = {
                        callback();
                } else {
                        var $this = this;
-                       if (window.gal != undefined && !OFLINEAPP) {
+                       if (window.gal != undefined && !OFFLINEAPP) {
                                window.gal.downloadAndCall('content_' + page, function() {
                                        $this.__loadBackground(page, callback);
                                }, 250);
index 3fdefc89c822eda83b301aa08bdf47dea78e6ea7..26db624140e5042a60fc5af6b9839835091a5111 100644 (file)
@@ -102,6 +102,7 @@ try {
                        var readyToLoad = false;
                        var finishedLoading = false;
                        gal = new GameAssetLoader(JSON.parse(manifest), fsprefix);
+                       gal = new GameAssetLoader(JSON.parse(manifest), fsprefix);
                        gal.init(function() {
                                startAfterLoading = true;
                                init();
@@ -263,21 +264,13 @@ try {
                                window.localStorage.setItem('locale', locale);
 
                                if (OFFLINEAPP) {
-                                       /**
-                                        * 
-                                        * @todo
-                                        */
+                                       window.location = getPublicationURL(id);
                                } else {
                                        var topmanifest = window.sessionStorage.getItem('topmanifest');
                                        window.gallocale = new GameAssetLoader(JSON.parse(topmanifest), window.sessionStorage.getItem('galfsprefix'));
                                        window.gallocale.init(function() {
                                                window.gallocale.downloadAndCall('p_' + id, function() {
-                                                       var url = window.home;
-                                                       var replace = "/" + fluidbook.datas.id + "/";
-                                                       var replaceby = "/" + id + "/";
-                                                       url = url.replace(replace, replaceby);
-                                                       var c = window.localStorage.getItem('collection');
-                                                       window.location = url;
+                                                       window.location = getPublicationURL(id);
                                                });
                                        });
                                }
@@ -483,3 +476,10 @@ function closePopin() {
        };
 })();
 
+function getPublicationURL(id) {
+       var url = window.home;
+       var replace = "/" + fluidbook.datas.id + "/";
+       var replaceby = "/" + id + "/";
+       url = url.replace(replace, replaceby);
+       return url;
+}
\ No newline at end of file