Skip to content

Commit ab59e5c

Browse files
author
SeanLin
committed
Merge pull request cocos2d#399 from dingpinglv/iss1339_ImproveTemplate
fixed cocos2d#1339 Improve template for version release
2 parents af51ea0 + 96506d9 commit ab59e5c

File tree

11 files changed

+159
-330
lines changed

11 files changed

+159
-330
lines changed

‎Demo/HelloDomMenu/cocos2d.js‎

Lines changed: 4 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
var cc = cc = cc || {};
3232
//Cocos2d directory
33-
cc.Dir = '../../cocos2d/';//in relate to the html file or use absolute
33+
cc.Dir = './';//in relate to the html file or use absolute
3434
cc.loadQue = [];//the load que which js files are loaded
3535
cc.COCOS2D_DEBUG = 2;
3636
cc._DEBUG = 1;
@@ -42,16 +42,6 @@ cc.$ = function (x) {
4242
cc.$new = function (x) {
4343
return document.createElement(x);
4444
};
45-
//function to load files into html
46-
/*
47-
cc.loadjs = function(filename)
48-
{
49-
//get a ref to header
50-
var head = cc.$('head');
51-
var insert = document.createElement('script');
52-
insert.setAttribute('src',cc.Dir+filename);
53-
head.appendChild(insert);
54-
};*/
5545

5646
cc.loadjs = function (filename) {
5747
//add the file to the que
@@ -91,44 +81,7 @@ cc.loadjs = function (filename) {
9181
}
9282
};
9383

84+
cc.loadjs('../../lib/Cocos2d-html5-dommenu-min.js');
9485

95-
cc.loadjs('platform/CCClass.js');//0
96-
cc.loadjs('platform/CCCommon.js');//1
97-
cc.loadjs('platform/platform.js');//2
98-
cc.loadjs('cocoa/CCGeometry.js');//3
99-
cc.loadjs('cocoa/CCSet.js');//4
100-
cc.loadjs('platform/CCTypes.js');//5
101-
cc.loadjs('cocoa/CCAffineTransform.js');//5
102-
cc.loadjs('support/CCPointExtension.js');//12
103-
cc.loadjs('base_nodes/CCNode.js');//6
104-
cc.loadjs('platform/ccMacro.js');//7
105-
cc.loadjs('platform/ccConfig.js');//7
106-
cc.loadjs('textures/CCTexture2D.js');//12
107-
cc.loadjs('textures/CCTextureCache.js');//12
108-
cc.loadjs('actions/CCAction.js');//7
109-
cc.loadjs('actions/CCActionInterval.js');//7
110-
cc.loadjs('actions/CCActionManager.js');//7
111-
cc.loadjs('actions/CCActionEase.js');//7
112-
cc.loadjs('layers_scenes_transitions_nodes/CCScene.js');//8
113-
cc.loadjs('layers_scenes_transitions_nodes/CCLayer.js');//9
114-
cc.loadjs('layers_scenes_transitions_nodes/CCTransition.js');//9
115-
cc.loadjs('sprite_nodes/CCSprite.js');//10
116-
cc.loadjs('label_nodes/CCLabelTTF.js');//11
117-
cc.loadjs('touch_dispatcher/CCTouchDelegateProtocol.js');//12
118-
cc.loadjs('touch_dispatcher/CCTouchHandler.js');//12
119-
cc.loadjs('touch_dispatcher/CCTouchDispatcher.js');//12
120-
cc.loadjs('keypad_dispatcher/CCKeypadDelegate.js');//12
121-
cc.loadjs('keypad_dispatcher/CCKeypadDispatcher.js');//12
122-
cc.loadjs('base_nodes/CCdomNode.js');
123-
cc.loadjs('CCDirector.js');//13
124-
cc.loadjs('CCScheduler.js');//14
125-
cc.loadjs('CCLoader.js');//14
126-
cc.loadjs('CCDrawingPrimitives.js');//15
127-
cc.loadjs('platform/CCApplication.js');//16
128-
cc.loadjs('../CocosDenshion/SimpleAudioEngine.js');
129-
cc.loadjs('platform/CCSAXParser.js');//16
130-
cc.loadjs('../Demo/HelloDomMenu/Classes/AppDelegate.js');//17
131-
cc.loadjs('platform/AppControl.js');//18
132-
cc.loadjs('../Demo/HelloDomMenu/HelloDom.js');//19
133-
cc.loadjs('menu_nodes/CCdomMenuItem.js');
134-
cc.loadjs('menu_nodes/CCdomMenu.js');
86+
cc.loadjs('Classes/AppDelegate.js');//17
87+
cc.loadjs('HelloDom.js');//19

‎Demo/HelloWorldTutorial/cocos2d.js‎

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,6 @@ cc.$ = function (x) {
4242
cc.$new = function (x) {
4343
return document.createElement(x);
4444
};
45-
//function to load files into html
46-
/*
47-
cc.loadjs = function(filename)
48-
{
49-
//get a ref to header
50-
var head = cc.$('head');
51-
var insert = document.createElement('script');
52-
insert.setAttribute('src',cc.Dir+filename);
53-
head.appendChild(insert);
54-
};*/
5545

5646
cc.loadjs = function (filename) {
5747
//add the file to the que
@@ -94,44 +84,7 @@ cc.loadjs = function (filename) {
9484
// Engine files,
9585
// They can be packeted to a single file using the Ant tool.
9686
// The shell files and Closure Compiler which Ant needs are provided in tools folder and cocos2d folder.
97-
cc.loadjs('../../cocos2d/platform/CCClass.js');//0
98-
cc.loadjs('../../cocos2d/platform/CCCommon.js');//1
99-
cc.loadjs('../../cocos2d/platform/platform.js');//2
100-
cc.loadjs('../../cocos2d/cocoa/CCGeometry.js');//3
101-
cc.loadjs('../../cocos2d/cocoa/CCSet.js');//4
102-
cc.loadjs('../../cocos2d/platform/CCTypes.js');//5
103-
cc.loadjs('../../cocos2d/cocoa/CCAffineTransform.js');//5
104-
cc.loadjs('../../cocos2d/support/CCPointExtension.js');//12
105-
cc.loadjs('../../cocos2d/base_nodes/CCNode.js');//6
106-
cc.loadjs('../../cocos2d/platform/ccMacro.js');//7
107-
cc.loadjs('../../cocos2d/platform/ccConfig.js');//7
108-
cc.loadjs('../../cocos2d/textures/CCTexture2D.js');//12
109-
cc.loadjs('../../cocos2d/textures/CCTextureCache.js');//12
110-
cc.loadjs('../../cocos2d/actions/CCAction.js');//7
111-
cc.loadjs('../../cocos2d/actions/CCActionInterval.js');//7
112-
cc.loadjs('../../cocos2d/actions/CCActionManager.js');//7
113-
cc.loadjs('../../cocos2d/actions/CCActionEase.js');//7
114-
cc.loadjs('../../cocos2d/layers_scenes_transitions_nodes/CCScene.js');//8
115-
cc.loadjs('../../cocos2d/layers_scenes_transitions_nodes/CCLayer.js');//9
116-
cc.loadjs('../../cocos2d/layers_scenes_transitions_nodes/CCTransition.js');
117-
cc.loadjs('../../cocos2d/sprite_nodes/CCSprite.js');//10
118-
cc.loadjs('../../cocos2d/label_nodes/CCLabelTTF.js');//11
119-
cc.loadjs('../../cocos2d/text_input_node/CCIMEDispatcher.js');//12
120-
cc.loadjs('../../cocos2d/touch_dispatcher/CCTouchDelegateProtocol.js');//12
121-
cc.loadjs('../../cocos2d/touch_dispatcher/CCTouchHandler.js');//12
122-
cc.loadjs('../../cocos2d/touch_dispatcher/CCTouchDispatcher.js');//12
123-
cc.loadjs('../../cocos2d/keypad_dispatcher/CCKeypadDelegate.js');//12
124-
cc.loadjs('../../cocos2d/keypad_dispatcher/CCKeypadDispatcher.js');//12
125-
cc.loadjs('../../cocos2d/CCDirector.js');//13
126-
cc.loadjs('../../cocos2d/CCScheduler.js');//14
127-
cc.loadjs('../../cocos2d/CCLoader.js');//14
128-
cc.loadjs('../../cocos2d/CCDrawingPrimitives.js');//15
129-
cc.loadjs('../../cocos2d/platform/CCApplication.js');//16
130-
cc.loadjs('../../cocos2d/platform/CCSAXParser.js');//16
131-
cc.loadjs('../../cocos2d/platform/AppControl.js');//18
132-
cc.loadjs('../../cocos2d/menu_nodes/CCMenuItem.js');
133-
cc.loadjs('../../cocos2d/menu_nodes/CCMenu.js');
134-
cc.loadjs('../../CocosDenshion/SimpleAudioEngine.js');
87+
cc.loadjs('../../lib/Cocos2d-html5-canvasmenu-min.js');
13588

13689
// User files
13790
cc.loadjs('Classes/AppDelegate.js');//17

‎Demo/NativeClientDemo/cocos2d.js‎

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
var cc = cc = cc || {};
3232
//Cocos2d directory
33-
cc.Dir = '../../cocos2d/';//in relate to the html file or use absolute
33+
cc.Dir = './';//in relate to the html file or use absolute
3434
cc.loadQue = [];//the load que which js files are loaded
3535
cc.COCOS2D_DEBUG = 2;
3636
cc._DEBUG = 1;
@@ -91,43 +91,6 @@ cc.loadjs = function (filename) {
9191
}
9292
};
9393

94-
95-
cc.loadjs('platform/CCClass.js');//0
96-
cc.loadjs('platform/CCCommon.js');//1
97-
cc.loadjs('platform/platform.js');//2
98-
cc.loadjs('cocoa/CCGeometry.js');//3
99-
cc.loadjs('cocoa/CCSet.js');//4
100-
cc.loadjs('platform/CCTypes.js');//5
101-
cc.loadjs('cocoa/CCAffineTransform.js');//5
102-
cc.loadjs('support/CCPointExtension.js');//12
103-
cc.loadjs('base_nodes/CCNode.js');//6
104-
cc.loadjs('base_nodes/CCdomNode.js');
105-
cc.loadjs('platform/ccMacro.js');//7
106-
cc.loadjs('platform/ccConfig.js');//7
107-
cc.loadjs('textures/CCTexture2D.js');//12
108-
cc.loadjs('textures/CCTextureCache.js');//12
109-
cc.loadjs('actions/CCAction.js');//7
110-
cc.loadjs('actions/CCActionInterval.js');//7
111-
cc.loadjs('actions/CCActionManager.js');//7
112-
cc.loadjs('actions/CCActionEase.js');//7
113-
cc.loadjs('layers_scenes_transitions_nodes/CCScene.js');//8
114-
cc.loadjs('layers_scenes_transitions_nodes/CCLayer.js');//9
115-
cc.loadjs('sprite_nodes/CCSprite.js');//10
116-
cc.loadjs('label_nodes/CCLabelTTF.js');//11
117-
cc.loadjs('touch_dispatcher/CCTouchDelegateProtocol.js');//12
118-
cc.loadjs('touch_dispatcher/CCTouchHandler.js');//12
119-
cc.loadjs('touch_dispatcher/CCTouchDispatcher.js');//12
120-
cc.loadjs('keypad_dispatcher/CCKeypadDelegate.js');//12
121-
cc.loadjs('keypad_dispatcher/CCKeypadDispatcher.js');//12
122-
cc.loadjs('CCDirector.js');//13
123-
cc.loadjs('CCScheduler.js');//14
124-
cc.loadjs('CCLoader.js');//14
125-
cc.loadjs('CCDrawingPrimitives.js');//15
126-
cc.loadjs('platform/CCApplication.js');//16
127-
cc.loadjs('../CocosDenshion/SimpleAudioEngine.js');
128-
cc.loadjs('platform/CCSAXParser.js');//16
129-
cc.loadjs('../Demo/NativeClientDemo/Classes/AppDelegate.js');//17
130-
cc.loadjs('platform/AppControl.js');//18
131-
cc.loadjs('../Demo/NativeClientDemo/NativeClient.js');//19
132-
cc.loadjs('menu_nodes/CCdomMenuItem.js');
133-
cc.loadjs('menu_nodes/CCdomMenu.js');
94+
cc.loadjs('../../lib/Cocos2d-html5-dommenu-min.js');
95+
cc.loadjs('Classes/AppDelegate.js'); //17
96+
cc.loadjs('NativeClient.js'); //19

‎HelloWorld/cocos2d.js‎

Lines changed: 6 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,6 @@ cc.$ = function (x) {
4242
cc.$new = function (x) {
4343
return document.createElement(x);
4444
};
45-
//function to load files into html
46-
/*
47-
cc.loadjs = function(filename)
48-
{
49-
//get a ref to header
50-
var head = cc.$('head');
51-
var insert = document.createElement('script');
52-
insert.setAttribute('src',cc.Dir+filename);
53-
head.appendChild(insert);
54-
};*/
5545

5646
cc.loadjs = function (filename) {
5747
//add the file to the que
@@ -97,47 +87,12 @@ cc.loadjs = function (filename) {
9787
}
9888
};
9989

100-
// Engine files,
101-
// They can be packeted to a single file using the Ant tool.
102-
// The shell files and Closure Compiler which Ant needs are provided in tools folder and cocos2d folder.
103-
cc.loadjs('../cocos2d/platform/CCClass.js');//0
104-
cc.loadjs('../cocos2d/platform/CCCommon.js');//1
105-
cc.loadjs('../cocos2d/platform/platform.js');//2
106-
cc.loadjs('../cocos2d/cocoa/CCGeometry.js');//3
107-
cc.loadjs('../cocos2d/cocoa/CCSet.js');//4
108-
cc.loadjs('../cocos2d/platform/CCTypes.js');//5
109-
cc.loadjs('../cocos2d/cocoa/CCAffineTransform.js');//5
110-
cc.loadjs('../cocos2d/support/CCPointExtension.js');//12
111-
cc.loadjs('../cocos2d/base_nodes/CCNode.js');//6
112-
cc.loadjs('../cocos2d/platform/CCMacro.js');//7
113-
cc.loadjs('../cocos2d/platform/CCConfig.js');//7
114-
cc.loadjs('../cocos2d/textures/CCTexture2D.js');//12
115-
cc.loadjs('../cocos2d/textures/CCTextureCache.js');//12
116-
cc.loadjs('../cocos2d/actions/CCAction.js');//7
117-
cc.loadjs('../cocos2d/actions/CCActionInterval.js');//7
118-
cc.loadjs('../cocos2d/actions/CCActionManager.js');//7
119-
cc.loadjs('../cocos2d/actions/CCActionEase.js');//7
120-
cc.loadjs('../cocos2d/layers_scenes_transitions_nodes/CCScene.js');//8
121-
cc.loadjs('../cocos2d/layers_scenes_transitions_nodes/CCLayer.js');//9
122-
cc.loadjs('../cocos2d/layers_scenes_transitions_nodes/CCTransition.js');
123-
cc.loadjs('../cocos2d/sprite_nodes/CCSprite.js');//10
124-
cc.loadjs('../cocos2d/label_nodes/CCLabelTTF.js');//11
125-
cc.loadjs('../cocos2d/text_input_node/CCIMEDispatcher.js');//12
126-
cc.loadjs('../cocos2d/touch_dispatcher/CCTouchDelegateProtocol.js');//12
127-
cc.loadjs('../cocos2d/touch_dispatcher/CCTouchHandler.js');//12
128-
cc.loadjs('../cocos2d/touch_dispatcher/CCTouchDispatcher.js');//12
129-
cc.loadjs('../cocos2d/keypad_dispatcher/CCKeypadDelegate.js');//12
130-
cc.loadjs('../cocos2d/keypad_dispatcher/CCKeypadDispatcher.js');//12
131-
cc.loadjs('../cocos2d/CCDirector.js');//13
132-
cc.loadjs('../cocos2d/CCScheduler.js');//14
133-
cc.loadjs('../cocos2d/CCLoader.js');//14
134-
cc.loadjs('../cocos2d/CCDrawingPrimitives.js');//15
135-
cc.loadjs('../cocos2d/platform/CCApplication.js');//16
136-
cc.loadjs('../cocos2d/platform/CCSAXParser.js');//16
137-
cc.loadjs('../cocos2d/platform/AppControl.js');//18
138-
cc.loadjs('../cocos2d/menu_nodes/CCMenuItem.js');
139-
cc.loadjs('../cocos2d/menu_nodes/CCMenu.js');
140-
cc.loadjs('../CocosDenshion/SimpleAudioEngine.js');
90+
var menuType = menuType || "DOM";
91+
if (menuType == "DOM") {
92+
cc.loadjs('../lib/Cocos2d-html5-dommenu-min.js');
93+
} else {
94+
cc.loadjs('../lib/Cocos2d-html5-canvasmenu-min.js');
95+
}
14196

14297
// User files
14398
cc.loadjs('Classes/AppDelegate.js');//17

‎cocos2d/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<target name="compile_Canvas">
88
<jscomp compilationLevel="simple" warning="quiet"
9-
debug="false" output="../lib/cocos2d-html5-alpha-canvasmenu-min.js">
9+
debug="false" output="../lib/Cocos2d-html5-canvasmenu-min.js">
1010
<externs dir="${basedir}">
1111
<file name="cocos2d_externs.js"/>
1212
</externs>
@@ -93,7 +93,7 @@
9393

9494
<target name="compile_Dom">
9595
<jscomp compilationLevel="simple" warning="quiet"
96-
debug="false" output="../lib/cocos2d-html5-alpha-dommenu-min.js">
96+
debug="false" output="../lib/Cocos2d-html5-dommenu-min.js">
9797
<externs dir="${basedir}">
9898
<file name="cocos2d_externs.js"/>
9999
</externs>

‎cocos2d/keypad_dispatcher/CCKeypadDispatcher.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ cc.KeypadDispatcher.sharedDispatcher = function () {
295295
cc.canvas.style.outline='none';
296296
cc.canvas.style.cursor = 'default';
297297
cc.canvas.addEventListener("keydown", function (e) {
298-
console.log(e);
299298
cc.keypadDispatcher.dispatchKeypadMSG(e, true);
300299
cc.IMEDispatcher.sharedDispatcher().processKeycode(e.keyCode);
301300
});

‎cocos2d/platform/CCConfig.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @constant
3434
* @type String
3535
*/
36-
cc.ENGINE_VERSION = "cocos2d-html5-v0.5.0-alpha2";
36+
cc.ENGINE_VERSION = "Cocos2d-html5-v0.5.0-alpha2";
3737

3838

3939
/**

‎tests/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
<target name="compile_test_advanced">
5454
<jscomp compilationLevel="advanced" warning="quiet"
55-
debug="false" output="cocos2d-html5-testcases.js">
55+
debug="false" output="cocos2d-html5-testcases-advanced.js">
5656
<externs dir="${basedir}/../cocos2d">
5757
<file name="cocos2d_externs.js"/>
5858
</externs>

0 commit comments

Comments
 (0)