From e73e4cd206cf94caa3eae820200d58a90a682a35 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Wed, 29 Dec 2010 16:38:45 +0100
Subject: [PATCH] Bug 621838 - The Addons pane is still pannable when the
 context menu of the search textbox is visible [r=mfinkle]

---
 mobile/chrome/content/bindings.xml | 6 +++++-
 mobile/chrome/content/input.js     | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mobile/chrome/content/bindings.xml b/mobile/chrome/content/bindings.xml
index 3f5f3514c5e5..51cc0a02ffa7 100644
--- a/mobile/chrome/content/bindings.xml
+++ b/mobile/chrome/content/bindings.xml
@@ -1687,7 +1687,11 @@
           if (hasData && (!aTextbox.readOnly || aIgnoreReadOnly))
             json.types.push("paste");
 
-          ContextHelper.showPopup({ target: aTextbox, json: json });
+          if (ContextHelper.showPopup({ target: aTextbox, json: json })) {
+            let event = document.createEvent("Events");
+            event.initEvent("CancelTouchSequence", true, false);
+            document.dispatchEvent(event);
+          }
         ]]></body>
       </method>
     </implementation>
diff --git a/mobile/chrome/content/input.js b/mobile/chrome/content/input.js
index 5382eb891bb0..a7ff039527d9 100644
--- a/mobile/chrome/content/input.js
+++ b/mobile/chrome/content/input.js
@@ -176,6 +176,7 @@ MouseModule.prototype = {
 
     this._targetScrollbox = null;
     this._targetScrollInterface = null;
+    this._inputField = null;
 
     this._cleanClickBuffer();
   },