Merge pull request cocos2d#12836 from pandamicro/v3.7-release

Fixed cocos2d#12834 Invoke cleanup function when override in JS
AMPedGames · Jul 14, 2015 · eb56ad6 · eb56ad6
2 parents a90a8b1 + efffea5
commit eb56ad6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cocos/scripting/js-bindings/manual/ScriptingCore.cpp b/cocos/scripting/js-bindings/manual/ScriptingCore.cpp
@@ -1034,6 +1034,11 @@ int ScriptingCore::handleNodeEvent(void* data)
     }
     else if (action == kNodeOnCleanup) {
         cleanupSchedulesAndActions(p);
+
+        if (isFunctionOverridedInJS(JS::RootedObject(_cx, p->obj.get()), "cleanup", js_cocos2dx_Node_cleanup))
+        {
+            ret = executeFunctionWithOwner(OBJECT_TO_JSVAL(p->obj), "cleanup", 1, &dataVal, &retval);
+        }
     }
 
     return ret;

diff --git a/tests/js-tests/src/tests-main.js b/tests/js-tests/src/tests-main.js
@@ -176,7 +176,7 @@ var TestController = cc.LayerGradient.extend({
                     return true;
                 }
             }, this);
-       }
+        }
     },
     onEnter:function(){
         this._super();