Merge pull request #3474 from xbruce/develop

closed #2746: cc.registerTargettedDelegate doesn't support pure js object as its target.
This commit is contained in:
James Chen 2013-08-28 02:29:09 -07:00
commit 3959cb0d3c
2 changed files with 2 additions and 1 deletions

View File

@ -1 +1 @@
1a67569d3ade0153cccbfa71ca5ac5355d03fbd4
966bc5a37a3c925e207d93e66c4913f05ba3bbb7

View File

@ -214,6 +214,7 @@ private:
typedef std::map<JSObject*, JSTouchDelegate*> TouchDelegateMap;
typedef std::pair<JSObject*, JSTouchDelegate*> TouchDelegatePair;
static TouchDelegateMap sTouchDelegateMap;
bool _needUnroot;
};