From 221b9313a778588001bf78461e38d3728db0ed32 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Mon, 5 Mar 2012 09:55:51 +0100
Subject: [PATCH] Bug 732350 - [b2g] Cancel the click event sooner when panning
 has started to prevent unexpected clicks r=fabrice

---
 b2g/chrome/content/webapi.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/b2g/chrome/content/webapi.js b/b2g/chrome/content/webapi.js
index a672be1e337c..7cced20f0d47 100644
--- a/b2g/chrome/content/webapi.js
+++ b/b2g/chrome/content/webapi.js
@@ -181,7 +181,10 @@ const ContentPanning = {
       case 'click':
         evt.stopPropagation();
         evt.preventDefault();
-        evt.target.removeEventListener('click', this, true);
+        
+        let target = evt.target;
+        let view = target.defaultView || target.ownerDocument.defaultView;
+        view.removeEventListener('click', this, true, true);
         break;
     }
   },
@@ -213,8 +216,11 @@ const ContentPanning = {
 
     let pan = KineticPanning.isPan();
     let click = evt.detail;
-    if (click && (pan || this.preventNextClick))
-      evt.target.addEventListener('click', this, true);
+    if (click && (pan || this.preventNextClick)) {
+      let target = evt.target;
+      let view = target.defaultView || target.ownerDocument.defaultView;
+      view.addEventListener('click', this, true, true);
+    }
 
     this.preventNextClick = false;