Skip to content

Commit

Permalink
update node.js for circle ci
Browse files Browse the repository at this point in the history
  • Loading branch information
jareguo committed Mar 14, 2016
1 parent ee7caa5 commit d71afe6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
machine:
node:
version: 5.1.1
version: 5.8.0

dependencies:
pre:
Expand Down
4 changes: 2 additions & 2 deletions cocos2d/core/components/CCComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ var Component = cc.Class({
});

// Support for Scheduler
this.__instanceId = this._id || cc.ClassManager.getNewInstanceId();
this.__instanceId = cc.ClassManager.getNewInstanceId();
},

properties: {
Expand Down Expand Up @@ -707,7 +707,7 @@ var Component = cc.Class({
repeat = isNaN(repeat) ? cc.Macro.REPEAT_FOREVER : repeat;
delay = delay || 0;

cc.director.getScheduler().scheduleCallbackForTarget(this, callback, interval, repeat, delay, !this.enabledInHierarchy);
cc.director.getScheduler().schedule(callback, this, interval, repeat, delay, !this.enabledInHierarchy, this.__instanceId);
},

/**
Expand Down

0 comments on commit d71afe6

Please sign in to comment.