Merge pull request #3498 from zilongshanren/improve-editbox-touch-handling

Improve editbox touch handling

Author: pandamicro

extensions/editbox/CCEditBox.js

@@ -154,14 +154,14 @@ cc.EditBoxDelegate = cc.Class.extend({
      * This method is called when an edit box gains focus after keyboard is shown.
      * @param {cc.EditBox} sender
      */
-    editBoxEditingDidBegan: function (sender) {
+    editBoxEditingDidBegin: function (sender) {
     },
 
     /**
      * This method is called when an edit box loses focus after keyboard is hidden.
      * @param {cc.EditBox} sender
      */
-    editBoxEditingDidEnded: function (sender) {
+    editBoxEditingDidEnd: function (sender) {
     },
 
     /**
@@ -176,7 +176,7 @@ cc.EditBoxDelegate = cc.Class.extend({
      * This method is called when the return button was pressed.
      * @param {cc.EditBox} sender
      */
-    editBoxEditingReturn: function (sender) {
+    editBoxReturn: function (sender) {
     }
 });
 
@@ -219,6 +219,8 @@ cc.EditBox = cc.Node.extend({
     _placeholderFontSize: 14,
     _placeholderColor: null,
     _className: 'EditBox',
+    _touchListener: null,
+    _touchEnabled: true,
 
     /**
      * constructor of cc.EditBox
@@ -238,16 +240,29 @@ cc.EditBox = cc.Node.extend({
         this.createDomElementIfNeeded();
         this.initWithSizeAndBackgroundSprite(size, normal9SpriteBg);
 
-        cc.eventManager.addListener({
+        this._touchListener = cc.EventListener.create({
             event: cc.EventListener.TOUCH_ONE_BY_ONE,
             swallowTouches: true,
             onTouchBegan: this._onTouchBegan.bind(this),
             onTouchEnded: this._onTouchEnded.bind(this)
-        }, this);
+        });
+        cc.eventManager.addListener(this._touchListener, this);
 
         this.setInputFlag(this._editBoxInputFlag);
     },
 
+    setTouchEnabled: function (enable) {
+        if (this._touchEnabled === enable) {
+            return;
+        }
+        this._touchEnabled = enable;
+        if (this._touchEnabled) {
+            cc.eventManager.addListener(this._touchListener, this);
+        } else {
+            cc.eventManager.removeListener(this._touchListener);
+        }
+    },
+
     _createRenderCmd: function () {
         if (cc._renderType === cc.game.RENDER_TYPE_CANVAS) {
             return new cc.EditBox.CanvasRenderCmd(this);
@@ -317,7 +332,21 @@ cc.EditBox = cc.Node.extend({
         this._renderCmd._removeDomFromGameContainer();
     },
 
+    _isAncestorsVisible: function (node) {
+        if (null == node)
+            return true;
+
+        var parent = node.getParent();
+
+        if (parent && !parent.isVisible())
+            return false;
+        return this._isAncestorsVisible(parent);
+    },
+
     _onTouchBegan: function (touch) {
+        if (!this.isVisible() || !this._isAncestorsVisible(this)) {
+            return;
+        }
         var touchPoint = touch.getLocation();
         var bb = cc.rect(0, 0, this._contentSize.width, this._contentSize.height);
         var hitted = cc.rectContainsPoint(bb, this.convertToNodeSpace(touchPoint));
@@ -331,6 +360,9 @@ cc.EditBox = cc.Node.extend({
     },
 
     _onTouchEnded: function () {
+        if (!this.isVisible() || !this._isAncestorsVisible(this)) {
+            return;
+        }
         this._renderCmd._beginEditing();
     },
 
@@ -871,8 +903,8 @@ cc.EditBox.create = function (size, normal9SpriteBg, press9SpriteBg, disabled9Sp
                 thisPointer._updateDomTextCases();
 
                 thisPointer._endEditing();
-                if (editBox._delegate && editBox._delegate.editBoxEditingReturn) {
-                    editBox._delegate.editBoxEditingReturn(editBox);
+                if (editBox._delegate && editBox._delegate.editBoxReturn) {
+                    editBox._delegate.editBoxReturn(editBox);
                 }
                 cc._canvas.focus();
             }
@@ -888,17 +920,17 @@ cc.EditBox.create = function (size, normal9SpriteBg, press9SpriteBg, disabled9Sp
                 thisPointer._onFocusOnMobile(editBox);
             }
 
-            if (editBox._delegate && editBox._delegate.editBoxEditingDidBegan) {
-                editBox._delegate.editBoxEditingDidBegan(editBox);
+            if (editBox._delegate && editBox._delegate.editBoxEditingDidBegin) {
+                editBox._delegate.editBoxEditingDidBegin(editBox);
             }
         });
         tmpEdTxt.addEventListener('blur', function () {
             var editBox = thisPointer._editBox;
             editBox._text = this.value;
             thisPointer._updateDomTextCases();
 
-            if (editBox._delegate && editBox._delegate.editBoxEditingDidEnded) {
-                editBox._delegate.editBoxEditingDidEnded(editBox);
+            if (editBox._delegate && editBox._delegate.editBoxEditingDidEnd) {
+                editBox._delegate.editBoxEditingDidEnd(editBox);
             }
 
             if (this.value === '') {
@@ -962,8 +994,8 @@ cc.EditBox.create = function (size, normal9SpriteBg, press9SpriteBg, disabled9Sp
                 thisPointer._onFocusOnMobile(editBox);
             }
 
-            if (editBox._delegate && editBox._delegate.editBoxEditingDidBegan) {
-                editBox._delegate.editBoxEditingDidBegan(editBox);
+            if (editBox._delegate && editBox._delegate.editBoxEditingDidBegin) {
+                editBox._delegate.editBoxEditingDidBegin(editBox);
             }
 
         });
@@ -973,8 +1005,8 @@ cc.EditBox.create = function (size, normal9SpriteBg, press9SpriteBg, disabled9Sp
             if (e.keyCode === cc.KEY.enter) {
                 e.stopPropagation();
 
-                if (editBox._delegate && editBox._delegate.editBoxEditingReturn) {
-                    editBox._delegate.editBoxEditingReturn(editBox);
+                if (editBox._delegate && editBox._delegate.editBoxReturn) {
+                    editBox._delegate.editBoxReturn(editBox);
                 }
             }
         });
@@ -983,8 +1015,8 @@ cc.EditBox.create = function (size, normal9SpriteBg, press9SpriteBg, disabled9Sp
             editBox._text = this.value;
             thisPointer._updateDomTextCases();
 
-            if (editBox._delegate && editBox._delegate.editBoxEditingDidEnded) {
-                editBox._delegate.editBoxEditingDidEnded(editBox);
+            if (editBox._delegate && editBox._delegate.editBoxEditingDidEnd) {
+                editBox._delegate.editBoxEditingDidEnd(editBox);
             }
 
             if (this.value === '') {