Merge pull request #1296 from pandamicro/develop

Closed #3342: UIWidget's container intercept touch event while they can't

Author: dingpinglv

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

@@ -440,7 +440,8 @@ ccs.UIListView = ccs.UILayout.extend(/** @lends ccs.UIListView# */{
      * @param {cc.Point} touchPoint
      */
     checkChildInfo: function (handleState, sender, touchPoint) {
-        this.interceptTouchEvent(handleState, sender, touchPoint);
+        if(this._enabled && this._touchEnabled)
+            this.interceptTouchEvent(handleState, sender, touchPoint);
     },
 
     moveChildren: function (offset) {

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

@@ -502,7 +502,8 @@ ccs.UIPageView = ccs.UILayout.extend(/** @lends ccs.UIPageView# */{
     },
 
     checkChildInfo: function (handleState, sender, touchPoint) {
-        this.interceptTouchEvent(handleState, sender, touchPoint);
+        if(this._enabled && this._touchEnabled)
+            this.interceptTouchEvent(handleState, sender, touchPoint);
     },
 
     interceptTouchEvent: function (handleState, sender, touchPoint) {

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

@@ -1309,7 +1309,8 @@ ccs.UIScrollView = ccs.UILayout.extend(/** @lends ccs.UIScrollView# */{
      * @param {cc.Point} touchPoint
      */
     checkChildInfo: function (handleState, sender, touchPoint) {
-        this.interceptTouchEvent(handleState, sender, touchPoint);
+        if(this._enabled && this._touchEnabled)
+            this.interceptTouchEvent(handleState, sender, touchPoint);
     },
 
     scrollToTopEvent: function () {