Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5229 from dumganhar/iss3858-jsclass-log-fix 

closed #3858: Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
This commit is contained in:
James Chen 2014-01-25 22:46:56 -08:00
parent 243a995dc1 6ecc8d37c5
commit d2893c1e1e
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cocos/scripting/javascript/script/jsb_cocos2d.js
View File

@ -651,10 +651,13 @@ cc.Class.extend = function (prop) {
function Class() {
// All construction is actually done in the init method
if (!initializing) {
if (!this.ctor)
cc.log("No ctor function found, please set `classes_need_extend` section at `ini` file as `tools/tojs/cocos2dx.ini`");
else
if (!this.ctor) {
if (this.__nativeObj)
cc.log("No ctor function found! Please check whether `classes_need_extend` section in `ini` file like which in `tools/tojs/cocos2dx.ini`");
}
else {
this.ctor.apply(this, arguments);
}
}
}

2
tools/bindings-generator

@ -1 +1 @@
Subproject commit 6ae9f506f5ac7288bd27d11594a8a8f4e6e8a7d1
Subproject commit 8fd59c24bf5b46d2e02a8173ac19cdfc877263c5

2
tools/tojs/cocos2dx_studio.ini
View File

@ -79,4 +79,4 @@ abstract_classes = ColliderDetector ColliderBody ArmatureDataManager ComAttribut
# Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'.
script_control_cpp = no
classes_need_extend = Armature
classes_need_extend = Armature ComController