Merge pull request #3384 from ronyeh/develop

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

Author: pandamicro

cocos2d/actions/CCAction.js

@@ -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.
      */
@@ -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,
 
     /**
@@ -562,7 +562,7 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{
      *
      * @param {Boolean} value
      */
-    setBoudarySet:function (value) {
+    setBoundarySet:function (value) {
         this._boundarySet = value;
     },
 

cocos2d/core/CCScheduler.js

@@ -25,12 +25,6 @@
  ****************************************************************************/
 
 
-/**
- * Minimum priority level for user scheduling.
- * @constant
- * @type Number
- */
-cc.PRIORITY_NON_SYSTEM = cc.PRIORITY_SYSTEM + 1;
 
 //data structures
 /**
@@ -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;

cocos2d/core/base-nodes/CCNode.js

@@ -2513,6 +2513,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
                 }
             }
         }
+        return ret;
     },
 
     doEnumerate: function(name, callback){