Merge pull request cocos2d#3177 from chengstory/Fix#23745

Fix scrollview rendering error

Author: pandamicro

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

@@ -303,6 +303,8 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{
     },
 
     _isInContainer: function (widget) {
+       if(!this._clippingEnabled) 
+            return true;
         var wPos = widget._position,
             wSize = widget._contentSize,
             wAnchor = widget._anchorPoint,
@@ -344,7 +346,7 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{
     addChild: function (widget, zOrder, tag) {
         if(!widget)
             return false;
-        if(this._clippingEnabled && this._isInContainer(widget) === false)
+        if(this._isInContainer(widget) === false)
             widget._inViewRect = false;
         zOrder = zOrder || widget.getLocalZOrder();
         tag = tag || widget.getTag();
@@ -417,7 +419,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._clippingEnabled && this._innerContainer._children.length !== 0 )
+        if(this._innerContainer._children.length !== 0 )
             this.updateChildren();
     },
 

extensions/cocostudio/loader/parsers/timelineParser-2.x.js

@@ -469,7 +469,7 @@
 
         this.widgetAttributes(widget, json);
 
-        var clipEnabled = json["ClipAble"];
+        var clipEnabled = json["ClipAble"] || false;
         if(clipEnabled != null)
             widget.setClippingEnabled(clipEnabled);
 
@@ -750,7 +750,7 @@
             widget.setBackGroundImage(path, type);
         });
 
-        var clipEnabled = json["ClipAble"];
+        var clipEnabled = json["ClipAble"] || false;
         widget.setClippingEnabled(clipEnabled);
 
         var colorType = getParam(json["ComboBoxIndex"], 0);