Merge pull request #12 from cocos2d/master

update js
cocos2d · Mar 18, 2014 · 5c25ea2 · 5c25ea2
2 parents 7ad27da + f97a929
commit 5c25ea2
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 2 deletions.
diff --git a/frameworks/js-bindings/bindings/script/jsb_cocos2d.js b/frameworks/js-bindings/bindings/script/jsb_cocos2d.js
@@ -595,6 +595,7 @@ cc.MenuItemFont.extend = cc.Class.extend;
 cc.MenuItemToggle.extend = cc.Class.extend;
 cc.Scene.extend = cc.Class.extend;
 cc.DrawNode.extend = cc.Class.extend;
+cc.Component.extend = cc.Class.extend;
 
 // Cocos2d-html5 supports multi scene resources preloading.
 // This is a compatible function for JSB.

diff --git a/templates/js-template-default/res/favicon.ico b/templates/js-template-default/res/favicon.ico
diff --git a/templates/js-template-runtime/res/favicon.ico b/templates/js-template-runtime/res/favicon.ico
diff --git a/tools/cocos2d-console b/tools/cocos2d-console
diff --git a/tools/tojs/cocos2dx.ini b/tools/tojs/cocos2dx.ini
@@ -29,7 +29,7 @@ headers = %(cocosdir)s/cocos/2d/cocos2d.h %(cocosdir)s/cocos/audio/include/Simpl
 
 classes = New.* Sprite.* Scene Node.* Director Layer.* Menu.* Touch .*Action.* Move.* Rotate.* Blink.* Tint.* Sequence Repeat.* Fade.* Ease.* Scale.* Transition.* Spawn Animat.* Flip.* Delay.* Skew.* Jump.* Place.* Show.* Progress.* PointArray ToggleVisibility.* RemoveSelf Hide Particle.* Label.* Atlas.* TextureCache.* Texture2D Cardinal.* CatmullRom.* ParallaxNode TileMap.* TMX.* CallFunc RenderTexture GridAction Grid3DAction GridBase$ .+Grid Shaky3D Waves3D FlipX3D FlipY3D Speed ActionManager Set SimpleAudioEngine Scheduler Orbit.* Follow.* Bezier.* CardinalSpline.* Camera.* DrawNode .*3D$ Liquid$ Waves$ ShuffleTiles$ TurnOffTiles$ Split.* Twirl$ FileUtils$ GLProgram ShaderCache Application ClippingNode MotionStreak TextFieldTTF GLViewProtocol GLView Component ComponentContainer __NodeRGBA __LayerRGBA SAXParser Event(?!.*(Physics).*).* Device Configuration
 
-classes_need_extend = Node Layer.* Sprite Menu MenuItem MenuItemFont MenuItemToggle Scene DrawNode
+classes_need_extend = Node Layer.* Sprite Menu MenuItem MenuItemFont MenuItemToggle Scene DrawNode Component
 
 # what should we skip? in the format ClassName::[function function]
 # ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also
+6 −8		README.md
+47 −40		bin/cocos.py
+10 −9		plugins/project_compile/project_compile.py