client is version0.4.7, start to fix comic exporoler.

[pettanr/pettanr.git] / public / assets / common.js

diff --git a/public/assets/common.js b/public/assets/common.js
index e4090b1..af4816a 100644 (file)
--- a/public/assets/common.js
+++ b/public/assets/common.js
@@ -1,6 +1,6 @@
 /*\r
  * pettanR common.js\r
- *   version 0.4.6\r
+ *   version 0.4.7\r
  * \r
  * author: itozyun\r
  */\r
@@ -547,17 +547,21 @@ pettanr.util = ( function(){
             if( ua.isIE){\r
                                el.onreadystatechange = detect;\r
             } else {\r
-               setTimeout( onLoad, 0);\r
+               el.onload = onLoad;\r
                        }\r
             function detect(){\r
-                if ( this.readyState == "complete") {\r
+                if ( this.readyState === "complete") {\r
                     this.onreadystatechange = new Function();\r
                     this.onreadystatechange = null;\r
-                    onLoad();\r
+                    setTimeout( asynkCallback, 0 );\r
                 }\r
             }                  \r
                        function onLoad(){\r
-                               callback( el);\r
+                               el.onload = null;\r
+                               setTimeout( asynkCallback, 0 );\r
+                       }\r
+                       function asynkCallback(){\r
+                               callback( el );\r
                        }\r
                }\r
        }\r
@@ -695,6 +699,7 @@ pettanr.CONST = ( function(){
        return {\r
                PETTANR_ROOT_PATH:                      PETTANR_ROOT_PATH,\r
                URL_ORIGINAL_PICTURES_JSON: ( isLocal === true ? 'json\/' : PETTANR_ROOT_PATH) + 'original_pictures.json',\r
+               URL_COMICS_JSON:                        ( isLocal === true ? 'json\/' : PETTANR_ROOT_PATH) + 'comics.json',\r
                URL_PANELS_JSON:                        ( isLocal === true ? 'json\/' : PETTANR_ROOT_PATH) + 'panels.json',\r
                NS_PETTANR_COMIC:                       'pettanr-comic',\r
                RESOURCE_PICTURE_PATH:          ( isLocal === true ? pettanr.ROOT_PATH : PETTANR_ROOT_PATH) + 'resource_pictures\/',\r