Merge pull request #1557 from dingpinglv/develop

dingpinglv · dingpinglv · commit b8ea3d6154c1 · 2015-03-18T13:57:48.000+08:00
Fixed a bug of template that it doesn't work when it doesn't add loading.js
diff --git a/frameworks/cocos2d-html5 b/frameworks/cocos2d-html5
@@ -1 +1 @@
-Subproject commit 8177639af56ae4916a2d5162bb07f5ed3b211f6e
+Subproject commit 81c6e1cd97570663dea438dc062048574c76a537
diff --git a/templates/js-template-default/main.js b/templates/js-template-default/main.js
@@ -48,7 +48,7 @@
  */
 
 cc.game.onStart = function(){
-    if(!cc.sys.isNative) //If referenced loading.js, please remove it
+    if(!cc.sys.isNative && document.getElementById("cocosLoading")) //If referenced loading.js, please remove it
         document.body.removeChild(document.getElementById("cocosLoading"));
 
     cc.view.adjustViewPort(true);
