From 303cd014c323d025ddcd6787507f552f6cebc5a8 Mon Sep 17 00:00:00 2001 From: zilongshanren Date: Wed, 8 Jun 2016 17:32:56 +0800 Subject: [PATCH] remove unused logic --- cocos2d/core/components/CCButton.js | 4 ---- cocos2d/core/components/CCScrollView.js | 21 +-------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/cocos2d/core/components/CCButton.js b/cocos2d/core/components/CCButton.js index 84bc031ae8..1721fdabd3 100644 --- a/cocos2d/core/components/CCButton.js +++ b/cocos2d/core/components/CCButton.js @@ -357,10 +357,6 @@ var Button = cc.Class({ this.node.on(cc.Node.EventType.MOUSE_LEAVE, this._onMouseMoveOut, this); }, - _cancelButtonClick: function(){ - this._pressed = false; - }, - _applyTarget: function () { var target = this.target; if (target) { diff --git a/cocos2d/core/components/CCScrollView.js b/cocos2d/core/components/CCScrollView.js index 229974853f..424d54a87d 100644 --- a/cocos2d/core/components/CCScrollView.js +++ b/cocos2d/core/components/CCScrollView.js @@ -787,32 +787,13 @@ var ScrollView = cc.Class({ this._touchMoved = false; }, - _cancelButtonClick: function(touch) { - var deltaMove = touch.getDelta(); - var needCancelTouch = false; - if (cc.sys.isMobile) { - //FIXME: touch move delta should be calculated by DPI. - var TOUCH_CANCEL_POINT = 7; - if (cc.pLength(deltaMove) > TOUCH_CANCEL_POINT) { - needCancelTouch = true; - } - } else { - needCancelTouch = true; - } - - return needCancelTouch; - }, - _onTouchMoved: function(event) { var touch = event.touch; if (this.content) { - var buttonComponent = event.target.getComponent(cc.Button); - if (buttonComponent && this._cancelButtonClick(touch)) { - buttonComponent._cancelButtonClick(); - } this._handleMoveLogic(touch); } var deltaMove = touch.getDelta(); + //FIXME: touch move delta should be calculated by DPI. if (cc.pLength(deltaMove) > 7) { this._touchMoved = true; }