Skip to content

Fix: doEnumerateRecursive(node, name, callback) now returns the return value. #3384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 6, 2016
Merged

Fix: doEnumerateRecursive(node, name, callback) now returns the return value. #3384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a710bd
doEnumerateRecursive(node, name, callback) now returns the return value.
ronyeh Oct 2, 2016
d7f91d6
Fix typos in comments and function name.
ronyeh Oct 2, 2016
b957fb1
Fix bug where PRIORITY_NON_SYSTEM is NaN. Moved the constant into the…
ronyeh Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cocos2d/actions/CCAction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,15 +185,15 @@ cc.Action = cc.Class.extend(/** @lends cc.Action# */{
},

/**
* Currently JavaScript Bindigns (JSB), in some cases, needs to use retain and release. This is a bug in JSB, <br/>
* Currently JavaScript Bindings (JSB), in some cases, needs to use retain and release. This is a bug in JSB, <br/>
* and the ugly workaround is to use retain/release. So, these 2 methods were added to be compatible with JSB. <br/>
* This is a hack, and should be removed once JSB fixes the retain/release bug.
*/
retain:function () {
},

/**
* Currently JavaScript Bindigns (JSB), in some cases, needs to use retain and release. This is a bug in JSB, <br/>
* Currently JavaScript Bindings (JSB), in some cases, needs to use retain and release. This is a bug in JSB, <br/>
* and the ugly workaround is to use retain/release. So, these 2 methods were added to be compatible with JSB. <br/>
* This is a hack, and should be removed once JSB fixes the retain/release bug.
*/
Expand Down Expand Up @@ -238,7 +238,7 @@ cc.Action.create = cc.action;
* @extends cc.Action
*/
cc.FiniteTimeAction = cc.Action.extend(/** @lends cc.FiniteTimeAction# */{
//! duration in seconds
// duration in seconds
_duration:0,

/**
Expand Down Expand Up @@ -562,7 +562,7 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{
*
* @param {Boolean} value
*/
setBoudarySet:function (value) {
setBoundarySet:function (value) {
this._boundarySet = value;
},

Expand Down
14 changes: 8 additions & 6 deletions cocos2d/core/CCScheduler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@
****************************************************************************/


/**
* Minimum priority level for user scheduling.
* @constant
* @type Number
*/
cc.PRIORITY_NON_SYSTEM = cc.PRIORITY_SYSTEM + 1;

//data structures
/**
Expand Down Expand Up @@ -1029,9 +1023,17 @@ cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{
this.unscheduleAllWithMinPriority(minPriority);
}
});

/**
* Priority level reserved for system services.
* @constant
* @type Number
*/
cc.Scheduler.PRIORITY_SYSTEM = (-2147483647 - 1);

/**
* Minimum priority level for user scheduling.
* @constant
* @type Number
*/
cc.Scheduler.PRIORITY_NON_SYSTEM = cc.Scheduler.PRIORITY_SYSTEM + 1;
1 change: 1 addition & 0 deletions cocos2d/core/base-nodes/CCNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2513,6 +2513,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
}
}
}
return ret;
},

doEnumerate: function(name, callback){
Expand Down