Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into issue2261_LoaderBug

ShengxiangChen · ShengxiangChen · commit f71a9d83671a · 2014-02-17T15:39:35.000+08:00
Conflicts:
	cocos2d/core/CCLoader.js
diff --git a/HelloHTML5World/src/resource.js b/HelloHTML5World/src/resource.js
@@ -4,9 +4,9 @@ var s_CloseSelected = "res/CloseSelected.png";
 
 var g_resources = [
     //image
-    {src:s_HelloWorld},
-    {src:s_CloseNormal},
-    {src:s_CloseSelected}
+    s_HelloWorld,
+    s_CloseNormal,
+    s_CloseSelected
 
     //plist
 
diff --git a/template/src/resource.js b/template/src/resource.js
@@ -4,9 +4,9 @@ var s_CloseSelected = "CloseSelected.png";
 
 var g_resources = [
     //image
-    {src:s_HelloWorld},
-    {src:s_CloseNormal},
-    {src:s_CloseSelected}
+    s_HelloWorld,
+    s_CloseNormal,
+    s_CloseSelected
 
     //plist
 
