From a318e31222cc4857d6b78b63f4d8d39005a23e7b Mon Sep 17 00:00:00 2001
From: enh <125615869@qq.com>
Date: Sun, 6 Dec 2015 22:51:22 +0800
Subject: [PATCH] We should not intercept touch event if scrollview's
 _direction is NONE

---
 cocos/ui/UIScrollView.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cocos/ui/UIScrollView.cpp b/cocos/ui/UIScrollView.cpp
index 81ae8b64a6..23c9fcc091 100644
--- a/cocos/ui/UIScrollView.cpp
+++ b/cocos/ui/UIScrollView.cpp
@@ -960,7 +960,8 @@ void ScrollView::interceptTouchEvent(Widget::TouchEventType event, Widget *sende
         Layout::interceptTouchEvent(event, sender, touch);
         return;
     }
-
+    if(_direction == Direction::NONE)
+        return;
     Vec2 touchPoint = touch->getLocation();
     switch (event)
     {