From 79547bb85947de24d85a3b6c18cc650a4acd2460 Mon Sep 17 00:00:00 2001 From: dingpinglv Date: Wed, 18 Mar 2015 14:24:19 +0800 Subject: [PATCH 1/2] Moved loading.js to res folder for Cocos console release mode. --- frameworks/cocos2d-html5 | 2 +- templates/js-template-default/index.html | 2 +- templates/js-template-default/{src => res}/loading.js | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename templates/js-template-default/{src => res}/loading.js (100%) diff --git a/frameworks/cocos2d-html5 b/frameworks/cocos2d-html5 index 81c6e1cd97..851bbbf15d 160000 --- a/frameworks/cocos2d-html5 +++ b/frameworks/cocos2d-html5 @@ -1 +1 @@ -Subproject commit 81c6e1cd97570663dea438dc062048574c76a537 +Subproject commit 851bbbf15de23d75b584ca33f8557990a33fdf63 diff --git a/templates/js-template-default/index.html b/templates/js-template-default/index.html index 162b1eedee..aa361249c2 100644 --- a/templates/js-template-default/index.html +++ b/templates/js-template-default/index.html @@ -20,7 +20,7 @@ - + diff --git a/templates/js-template-default/src/loading.js b/templates/js-template-default/res/loading.js similarity index 100% rename from templates/js-template-default/src/loading.js rename to templates/js-template-default/res/loading.js From 7a570a578b0c5f1ea19516c6e2631fed66642637 Mon Sep 17 00:00:00 2001 From: dingpinglv Date: Wed, 18 Mar 2015 14:27:07 +0800 Subject: [PATCH 2/2] Update the reference of cocos2d-html5 --- frameworks/cocos2d-html5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/cocos2d-html5 b/frameworks/cocos2d-html5 index 851bbbf15d..dfa6d6cfae 160000 --- a/frameworks/cocos2d-html5 +++ b/frameworks/cocos2d-html5 @@ -1 +1 @@ -Subproject commit 851bbbf15de23d75b584ca33f8557990a33fdf63 +Subproject commit dfa6d6cfae9cec42f9cc422cdd8115777b209cac