[Pkg-mozext-commits] [firegestures] 07/13: fix: in-content xul:menulist doesn't work if trigger button is left

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firegestures.

commit b321732bd176d133544521f4f9e1cf32d70daa0d
Author: Gomita <gomita at xuldev.org>
Date:   Sat Dec 27 17:31:03 2014 +0900

    fix: in-content xul:menulist doesn't work if trigger button is left
---
 components/xdGestureHandler.js | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/components/xdGestureHandler.js b/components/xdGestureHandler.js
index a3f51c7..750ee74 100644
--- a/components/xdGestureHandler.js
+++ b/components/xdGestureHandler.js
@@ -192,21 +192,19 @@ xdGestureHandler.prototype = {
 				if (!this._gestureObserver.canStartGesture(event))
 					break;
 				if (event.button == 0) {
-					// suppress starting gesture on textboxes and textarea elements etc.
-					var targetName = event.target.localName.toUpperCase();
-					if (targetName == "INPUT" || targetName == "TEXTAREA") {
-						log("*** ignore left-click on form element (" + targetName + ")");	// #debug
-						break;
-					}
-					// suppress starting gesture when dragging scrollbar
-					targetName = event.originalTarget.localName;
-					if (targetName == "scrollbarbutton" || targetName == "slider" || targetName == "thumb") {
-						log("*** ignore left-click on scrollbar element (" + targetName + ")");	// #debug
-						break;
-					}
-					if (this._triggerButton == 0 && targetName == "select") {
-						log("*** ignore left-click on select element");	// #debug
-						break;
+					if (this._triggerButton == 0) {
+						// suppress starting gesture with left-button on HTML/XUL form elements
+						var localName = event.target.localName;
+						if (["input", "textarea", "select", "option", "textbox", "menulist"].indexOf(localName) >= 0) {
+							log("*** suppress starting gesture on form element (" + localName + ")");	// #debug
+							break;
+						}
+						// suppress starting gesture with left-button on scrollbar
+						var localName = event.originalTarget.localName;
+						if (["scrollbarbutton", "slider", "thumb"].indexOf(localName) >= 0) {
+							log("*** suppress starting gesture on scrollbar (" + localName + ")");	// #debug
+							break;
+						}
 					}
 					this._isMouseDownL = true;
 					this._isMouseDownM = false;	// fixed invalid state of _isMouseDownM after autoscrolling
@@ -236,9 +234,9 @@ xdGestureHandler.prototype = {
 				else if (event.button == 2) {
 					// this fixes the problem: when showing context menu of a Flash movie, 
 					// _isMouseDownR becomes true and then rocker-left will be fired with a left-click
-					var targetName = event.target.localName.toUpperCase();
-					if (targetName == "OBJECT" || targetName == "EMBED") {
-						log("*** ignore right-click on flash movie (" + targetName + ")");	// #debug
+					var localName = event.target.localName;
+					if (localName == "object" || localName == "embed") {
+						log("*** ignore right-click on flash movie (" + localName + ")");	// #debug
 						break;
 					}
 					this._isMouseDownR = true;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firegestures.git