issue #4174 refactor addNode and addChild for widget

Author: xingsenma

extensions/CocoStudio/GUI/BaseClasses/UIWidget.js

@@ -181,19 +181,6 @@ ccs.Widget = ccs.NodeRGBA.extend(/** @lends ccs.Widget# */{
         }
     },
 
-    /**
-     * Adds a child to the container.
-     * @param {ccs.Widget} child
-     */
-    addChild: function (child, zOrder, tag) {
-        if(!(child instanceof ccs.Widget)){
-            cc.log("Widget only supports Widgets as children");
-            return;
-        }
-        cc.NodeRGBA.prototype.addChild.call(this, child, zOrder, tag);
-        this._widgetChildren.push(child);
-    },
-
     sortAllChildren: function () {
         this._reorderWidgetChildDirty = this._reorderChildDirty;
         cc.NodeRGBA.prototype.sortAllChildren.call(this);
@@ -223,6 +210,41 @@ ccs.Widget = ccs.NodeRGBA.extend(/** @lends ccs.Widget# */{
         }
     },
 
+    /**
+     * Adds a child to the container.
+     * @param {ccs.Widget} widget
+     * @param {Number} zOrder
+     * @param {Number} tag
+     */
+    addChild: function (widget, zOrder, tag) {
+        if(widget instanceof ccs.Widget){
+            cc.NodeRGBA.prototype.addChild.call(this, widget, zOrder, tag);
+            this._widgetChildren.push(widget);
+            return;
+        }
+        if(widget instanceof cc.Node){
+            cc.log("Please use addNode to add a CCNode.");
+            return;
+        }
+    },
+
+    /**
+     *
+     * @param tag
+     * @returns {ccs.Widget}
+     */
+    getChildByTag:function(tag){
+        var __children = this._widgetChildren;
+        if (__children != null) {
+            for (var i = 0; i < __children.length; i++) {
+                var node = __children[i];
+                if (node && node._tag == tag)
+                    return node;
+            }
+        }
+        return null;
+    },
+
     /**
      * Return an array of children
      * @returns {Array}
@@ -236,7 +258,7 @@ ccs.Widget = ccs.NodeRGBA.extend(/** @lends ccs.Widget# */{
      * @returns {Number}
      */
     getChildrenCount: function () {
-        return this._widgetChildren ? this._widgetChildren.length : 0;
+        return this._widgetChildren.length;
     },
 
     getWidgetParent: function () {
@@ -247,22 +269,18 @@ ccs.Widget = ccs.NodeRGBA.extend(/** @lends ccs.Widget# */{
         return null;
     },
 
-    removeFromParent: function (cleanup) {
-        cc.NodeRGBA.prototype.removeFromParent.call(this, cleanup);
-    },
-
-    removeFromParentAndCleanup: function (cleanup) {
-        cc.NodeRGBA.prototype.removeFromParent.call(this, cleanup);
-    },
-
     /**
      * remove  child
-     * @param {ccs.Widget} child
+     * @param {ccs.Widget} widget
      * @param {Boolean} cleanup
      */
-    removeChild: function (child, cleanup) {
-        cc.NodeRGBA.prototype.removeChild.call(this, child, cleanup);
-        cc.ArrayRemoveObject(this._widgetChildren, child);
+    removeChild: function (widget, cleanup) {
+        if(!(widget instanceof ccs.Widget)){
+            cc.log("child must a type of ccs.Widget");
+            return;
+        }
+        cc.NodeRGBA.prototype.removeChild.call(this, widget, cleanup);
+        cc.ArrayRemoveObject(this._widgetChildren, widget);
     },
 
     removeChildByTag: function (tag, cleanup) {
@@ -280,12 +298,11 @@ ccs.Widget = ccs.NodeRGBA.extend(/** @lends ccs.Widget# */{
      * Removes all children from the container, and do a cleanup to all running actions depending on the cleanup parameter.
      */
     removeAllChildren: function (cleanup) {
-        var childrenLength = this._widgetChildren.length;
-        if (childrenLength <= 0) {
-            return
+        for (var i = 0; i < this._widgetChildren.length; i++) {
+            var widget = this._widgetChildren[i];
+            cc.NodeRGBA.prototype.removeChild.call(this, widget, cleanup);
         }
-        cc.NodeRGBA.prototype.removeAllChildren.call(this, cleanup);
-        this._widgetChildren = [];
+        this._widgetChildren.length = 0;
     },
 
     /**
@@ -332,7 +349,7 @@ ccs.Widget = ccs.NodeRGBA.extend(/** @lends ccs.Widget# */{
      */
     addNode: function (node, zOrder, tag) {
         if (node instanceof ccs.Widget) {
-            cc.log("Widget only supports Nodes as renderer");
+            cc.log("Please use addChild to add a Widget.");
             return;
         }
         cc.NodeRGBA.prototype.addChild.call(this, node, zOrder, tag);
@@ -345,8 +362,9 @@ ccs.Widget = ccs.NodeRGBA.extend(/** @lends ccs.Widget# */{
      * @returns {cc.Node}
      */
     getNodeByTag: function (tag) {
-        for (var i = 0; i < this._nodes.length; i++) {
-            var node = this._nodes[i];
+        var _nodes = this._nodes;
+        for (var i = 0; i < _nodes.length; i++) {
+            var node = _nodes[i];
             if (node && node.getTag() == tag) {
                 return node;
             }
@@ -365,17 +383,19 @@ ccs.Widget = ccs.NodeRGBA.extend(/** @lends ccs.Widget# */{
     /**
      * remove node
      * @param {cc.Node} node
+     * @param {Boolean} cleanup
      */
-    removeNode: function (node) {
+    removeNode: function (node, cleanup) {
         cc.NodeRGBA.prototype.removeChild.call(this, node);
         cc.ArrayRemoveObject(this._nodes, node);
     },
 
     /**
      *  remove node by tag
-     * @param tag
+     * @param {Number} tag
+     * @param {Boolean} cleanup
      */
-    removeNodeByTag: function (tag) {
+    removeNodeByTag: function (tag, cleanup) {
         var node = this.getNodeByTag(tag);
         if (!node) {
             cc.log("cocos2d: removeNodeByTag(tag = %d): child not found!", tag);
@@ -393,7 +413,7 @@ ccs.Widget = ccs.NodeRGBA.extend(/** @lends ccs.Widget# */{
             var node = this._nodes[i];
             cc.NodeRGBA.prototype.removeChild.call(this, node);
         }
-        this._nodes = [];
+        this._nodes.length = 0;
     },
 
     /**

extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIPageView.js

@@ -270,10 +270,12 @@ ccs.PageView = ccs.Layout.extend(/** @lends ccs.PageView# */{
     /**
      *  remove widget child override
      * @param {ccs.Widget} child
+     * @param {Boolean} cleanup
      */
-    removeChild: function (child) {
-        cc.ArrayRemoveObject(this._pages, child);
-        ccs.Layout.prototype.removeChild.call(this, child);
+    removeChild: function (child, cleanup) {
+        if(cleanup)
+            cc.ArrayRemoveObject(this._pages, child);
+        ccs.Layout.prototype.removeChild.call(this, child, cleanup);
     },
 
     onSizeChanged: function () {
@@ -316,9 +318,10 @@ ccs.PageView = ccs.Layout.extend(/** @lends ccs.PageView# */{
         }
     },
 
-    removeAllChildren: function () {
-        this._pages = [];
-        ccs.Layout.prototype.removeAllChildren.call(this);
+    removeAllChildren: function (cleanup) {
+        if(cleanup)
+            this._pages.length = 0;
+        ccs.Layout.prototype.removeAllChildren.call(this, cleanup);
     },
 
     /**

extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollView.js

@@ -253,17 +253,18 @@ ccs.ScrollView = ccs.Layout.extend(/** @lends ccs.ScrollView# */{
         return this._innerContainer.addChild(widget, zOrder, tag);
     },
 
-    removeAllChildren: function () {
-        this._innerContainer.removeAllChildren();
+    removeAllChildren: function (cleanup) {
+        this._innerContainer.removeAllChildren(cleanup);
     },
 
     /**
      *  remove widget child override
      * @param {ccs.Widget} child
+     * @param {Boolean} cleanup
      * @returns {boolean}
      */
-    removeChild: function (child) {
-        return this._innerContainer.removeChild(child);
+    removeChild: function (child, cleanup) {
+        return this._innerContainer.removeChild(child,cleanup);
     },
 
     /**
@@ -300,6 +301,56 @@ ccs.ScrollView = ccs.Layout.extend(/** @lends ccs.ScrollView# */{
         return this._innerContainer.getChildByName(name);
     },
 
+    /**
+     * Add node for scrollView
+     * @param {cc.Node}node
+     * @param {Number} zOrder
+     * @param {Number} tag
+     */
+    addNode: function (node, zOrder, tag) {
+        this._innerContainer.addNode(node, zOrder, tag);
+    },
+
+    /**
+     * Get node by tag
+     * @param {Number} tag
+     * @returns {cc.Node}
+     */
+    getNodeByTag: function (tag) {
+        return this._innerContainer.getNodeByTag(tag);
+    },
+
+    /**
+     * Get all node
+     * @returns {Array}
+     */
+    getNodes: function () {
+        return this._innerContainer.getNodes();
+    },
+
+    /**
+     * Remove a node
+     * @param {cc.Node} node
+     */
+    removeNode: function (node) {
+        this._innerContainer.removeNode(node);
+    },
+
+    /**
+     * Remove a node by tag
+     * @param {Number} tag
+     */
+    removeNodeByTag: function (tag) {
+        this._innerContainer.removeNodeByTag(tag);
+    },
+
+    /**
+     * Remove all node
+     */
+    removeAllNodes: function () {
+        this._innerContainer.removeAllNodes();
+    },
+    
     moveChildren: function (offsetX, offsetY) {
         var pos = this._innerContainer.getPosition();
         this._moveChildPoint.x = pos.x + offsetX;