From 68681ef83cc65b6db5592de94cbc855973294401 Mon Sep 17 00:00:00 2001
From: "flamingice%sourmilk.net"
 <flamingice%sourmilk.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 15 Jun 2007 19:42:31 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20377686,=20listbox.xml/richlistbox.xml=20c?=
 =?UTF-8?q?leanup,=20Patch=20by=20Simon=20B=C3=83=C2=BCnzli,=20r=3Denn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.0.0.236/trunk@228134 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/content/widgets/listbox.xml   | 45 +++++++++++--------
 .../toolkit/content/widgets/richlistbox.xml   | 26 -----------
 2 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/mozilla/toolkit/content/widgets/listbox.xml b/mozilla/toolkit/content/widgets/listbox.xml
index 64e8b131825..8bfd6f7f885 100644
--- a/mozilla/toolkit/content/widgets/listbox.xml
+++ b/mozilla/toolkit/content/widgets/listbox.xml
@@ -548,6 +548,33 @@
       <field name="_currentItem">null</field>
       <field name="_selectionStart">null</field>
     </implementation>
+
+    <handlers>
+      <handler event="keypress" keycode="VK_UP" modifiers="control shift any"
+               action="moveByOffset(-1, !event.ctrlKey, event.shiftKey);"
+               phase="target" preventdefault="true"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="control shift any"
+               action="moveByOffset(1, !event.ctrlKey, event.shiftKey);"
+               phase="target" preventdefault="true"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="control shift any"
+               action="moveByOffset(-this.currentIndex, !event.ctrlKey, event.shiftKey);"
+               phase="target" preventdefault="true"/>
+      <handler event="keypress" keycode="VK_END" modifiers="control shift any"
+               action="moveByOffset(this.getRowCount() - this.currentIndex - 1, !event.ctrlKey, event.shiftKey);"
+               phase="target" preventdefault="true"/>
+      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="control shift any"
+               action="moveByOffset(this.scrollOnePage(-1), !event.ctrlKey, event.shiftKey);"
+               phase="target" preventdefault="true"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="control shift any"
+               action="moveByOffset(this.scrollOnePage(1), !event.ctrlKey, event.shiftKey);"
+               phase="target" preventdefault="true"/>
+      <handler event="keypress" key=" " modifiers="control" phase="target">
+        <![CDATA[
+          if (this.currentItem && this.selType == "multiple")
+            this.toggleItemSelection(this.currentItem);
+        ]]>
+      </handler>
+    </handlers>
   </binding>
 
 
@@ -707,18 +734,6 @@
     </implementation>
     
     <handlers>
-      <handler event="keypress" keycode="VK_UP" modifiers="control shift any"
-               phase="target" action="moveByOffset(-1, !event.ctrlKey, event.shiftKey);"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="control shift any"
-               phase="target" action="moveByOffset(1, !event.ctrlKey, event.shiftKey);"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="control shift any"
-               phase="target" action="moveByOffset(-this.currentIndex, !event.ctrlKey, event.shiftKey);"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control shift any"
-               phase="target" action="moveByOffset(this.getRowCount() - this.currentIndex - 1, !event.ctrlKey, event.shiftKey);"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="control shift any"
-               phase="target" action="moveByOffset(this.scrollOnePage(-1), !event.ctrlKey, event.shiftKey);"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="control shift any"
-               phase="target" action="moveByOffset(this.scrollOnePage(1), !event.ctrlKey, event.shiftKey);"/>
       <handler event="keypress" key=" " phase="target">
         <![CDATA[
           if (this.currentItem) {
@@ -737,12 +752,6 @@
           this._lastKeyTime = 0;
         ]]>
       </handler>
-      <handler event="keypress" key=" " modifiers="control" phase="target">
-        <![CDATA[
-          if (this.currentItem && this.selType == "multiple")
-            this.toggleItemSelection(this.currentItem);
-        ]]>
-      </handler>
       <handler event="keypress" phase="target">
       <![CDATA[
          if (!this.disableKeyNavigation && event.charCode > 0 && 
diff --git a/mozilla/toolkit/content/widgets/richlistbox.xml b/mozilla/toolkit/content/widgets/richlistbox.xml
index 2630f00a2c3..7bcc321723c 100644
--- a/mozilla/toolkit/content/widgets/richlistbox.xml
+++ b/mozilla/toolkit/content/widgets/richlistbox.xml
@@ -460,32 +460,6 @@
     </implementation>
 
     <handlers>
-      <!-- handle keyboard navigation also when a child element has got the focus -->
-      <handler event="keypress" keycode="VK_UP"
-               modifiers="control shift any"
-               action="this.moveByOffset(-1, !event.ctrlKey, event.shiftKey);"
-               preventdefault="true"/>
-      <handler event="keypress" keycode="VK_DOWN"
-               modifiers="control shift any"
-               action="this.moveByOffset(1, !event.ctrlKey, event.shiftKey);"
-               preventdefault="true"/>
-      <handler event="keypress" keycode="VK_HOME"
-               modifiers="control shift any"
-               action="this.moveByOffset(-this.currentIndex, !event.ctrlKey, event.shiftKey);"
-               preventdefault="true"/>
-      <handler event="keypress" keycode="VK_END"
-               modifiers="control shift any"
-               action="this.moveByOffset(this.getRowCount(), !event.ctrlKey, event.shiftKey);"
-               preventdefault="true"/>
-      <handler event="keypress" keycode="VK_PAGE_UP"
-               modifiers="control shift any"
-               action="this.moveByOffset(this.scrollOnePage(-1), !event.ctrlKey, event.shiftKey);"
-               preventdefault="true"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN"
-               modifiers="control shift any"
-               action="this.moveByOffset(this.scrollOnePage(1), !event.ctrlKey, event.shiftKey);"
-               preventdefault="true"/>
-
       <handler event="click">
         <![CDATA[
           // clicking into nothing should unselect