From aa157eaf6d4544f8f82760fb60ab0c7ca3e3373a Mon Sep 17 00:00:00 2001
From: "varga%nixcorp.com" <varga%nixcorp.com>
Date: Wed, 1 Jun 2005 13:24:11 +0000
Subject: [PATCH] Fix for bug 287461. Caret Browsing is hardbound to the F7 key
 and is unable to be overridden with javascript like F3, F5, etc. r+sr=neil
 patch by Brian King <brian@mozdev.org>

---
 toolkit/content/widgets/browser.xml                | 4 ++--
 xpfe/global/resources/content/bindings/browser.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml
index 3d05da187c26..1311ea986cd0 100644
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -813,9 +813,9 @@
     </implementation>
 
     <handlers>
-      <handler event="keypress" keycode="VK_F7">
+      <handler event="keypress" keycode="VK_F7" group="system">
         <![CDATA[
-          if (!event.isTrusted)
+          if (event.getPreventDefault() || !event.isTrusted)
             return;
 
           // Toggle browse with caret mode
diff --git a/xpfe/global/resources/content/bindings/browser.xml b/xpfe/global/resources/content/bindings/browser.xml
index a8db6e2d49aa..ca6f1403edfa 100644
--- a/xpfe/global/resources/content/bindings/browser.xml
+++ b/xpfe/global/resources/content/bindings/browser.xml
@@ -395,9 +395,9 @@
     </implementation>
 
     <handlers>
-      <handler event="keypress" keycode="VK_F7">
+      <handler event="keypress" keycode="VK_F7" group="system">
         <![CDATA[
-          if (!event.isTrusted)
+          if (event.getPreventDefault() || !event.isTrusted)
             return;
 
           // Toggle browse with caret mode