From 7d2a9985e464075507e8d786fe4e61f0afd4a4fa Mon Sep 17 00:00:00 2001 From: zilongshanren Date: Fri, 24 Jun 2016 14:59:17 +0800 Subject: [PATCH] reuse _onTouchCancel logic --- cocos2d/core/components/CCButton.js | 4 ---- cocos2d/core/components/CCScrollView.js | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cocos2d/core/components/CCButton.js b/cocos2d/core/components/CCButton.js index 9de5498677..f18a763a0a 100644 --- a/cocos2d/core/components/CCButton.js +++ b/cocos2d/core/components/CCButton.js @@ -416,10 +416,6 @@ var Button = cc.Class({ event.stopPropagation(); }, - _cancelButtonClick: function(){ - this._pressed = false; - }, - _onTouchCancel: function () { if (!this.interactable || !this.enabledInHierarchy) return; diff --git a/cocos2d/core/components/CCScrollView.js b/cocos2d/core/components/CCScrollView.js index 39002a224c..a4615f8f46 100644 --- a/cocos2d/core/components/CCScrollView.js +++ b/cocos2d/core/components/CCScrollView.js @@ -798,7 +798,7 @@ var ScrollView = cc.Class({ this._touchMoved = true; var buttonComponent = event.target.getComponent(cc.Button); if (buttonComponent) { - buttonComponent._cancelButtonClick(); + buttonComponent._onTouchCancel(); } } // TODO: detect move distance, if distance greater than a seuil, then stop propagation.