Merge pull request cocos2d#3152 from chengstory/Fix#23455

Check clipping enabled before eliminating out of clip nodes.

Author: pandamicro

extensions/ccui/uiwidgets/scroll-widget/UIScrollView.js

@@ -344,7 +344,7 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{
     addChild: function (widget, zOrder, tag) {
         if(!widget)
             return false;
-        if(this._isInContainer(widget) === false)
+        if(this._clippingEnabled && this._isInContainer(widget) === false)
             widget._inViewRect = false;
         zOrder = zOrder || widget.getLocalZOrder();
         tag = tag || widget.getTag();
@@ -417,7 +417,7 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{
         this._moveChildPoint.x = locContainer.x + offsetX;
         this._moveChildPoint.y = locContainer.y + offsetY;
         this._innerContainer.setPosition(this._moveChildPoint);
-        if(this._innerContainer._children.length !== 0 )
+        if(this._clippingEnabled && this._innerContainer._children.length !== 0 )
             this.updateChildren();
     },