Merge pull request #1558 from dingpinglv/develop

dingpinglv · dingpinglv · commit 56e55c998a54 · 2015-03-18T14:47:19.000+08:00
Moved loading.js to res folder for Cocos console release mode.
diff --git a/frameworks/cocos2d-html5 b/frameworks/cocos2d-html5
@@ -1 +1 @@
-Subproject commit 81c6e1cd97570663dea438dc062048574c76a537
+Subproject commit dfa6d6cfae9cec42f9cc422cdd8115777b209cac
diff --git a/templates/js-template-default/index.html b/templates/js-template-default/index.html
@@ -20,7 +20,7 @@
     </style>
 </head>
 <body style="padding:0; margin: 0; background: #000;">
-<script src="src/loading.js"></script>
+<script src="res/loading.js"></script>
 <canvas id="gameCanvas" width="800" height="450"></canvas>
 <script src="frameworks/cocos2d-html5/CCBoot.js"></script>
 <script src="main.js"></script>
diff --git a/templates/js-template-default/res/loading.js b/templates/js-template-default/res/loading.js
