From b4f3205ddc7fd72e667eb69cb8e24fdce9a7eef7 Mon Sep 17 00:00:00 2001 From: "gijskruitbosch%gmail.com" Date: Tue, 18 Sep 2007 14:26:06 +0000 Subject: [PATCH] Bug 382990 - Tree onkeypress should check for ctrl key (+ test to make sure this keeps working) r=mano@mozilla.com (Asaf Romano) a=bzbarsky@mit.edu (Boris Zbarsky) git-svn-id: svn://10.0.0.236/trunk@236211 18797224-902f-48f8-a5cc-f745e15eee43 --- .../toolkit/content/tests/widgets/Makefile.in | 1 + .../content/tests/widgets/test_bug382990.xul | 45 +++++++++++++++++++ mozilla/toolkit/content/widgets/tree.xml | 2 +- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 mozilla/toolkit/content/tests/widgets/test_bug382990.xul diff --git a/mozilla/toolkit/content/tests/widgets/Makefile.in b/mozilla/toolkit/content/tests/widgets/Makefile.in index 7483149c157..4ab4660974b 100644 --- a/mozilla/toolkit/content/tests/widgets/Makefile.in +++ b/mozilla/toolkit/content/tests/widgets/Makefile.in @@ -47,6 +47,7 @@ include $(topsrcdir)/config/rules.mk _TEST_FILES = test_bug360220.xul \ test_bug359754.xul \ test_bug365773.xul \ + test_bug382990.xul \ test_closemenu_attribute.xul \ test_colorpicker_popup.xul \ test_deck.xul \ diff --git a/mozilla/toolkit/content/tests/widgets/test_bug382990.xul b/mozilla/toolkit/content/tests/widgets/test_bug382990.xul new file mode 100644 index 00000000000..35b5a035e66 --- /dev/null +++ b/mozilla/toolkit/content/tests/widgets/test_bug382990.xul @@ -0,0 +1,45 @@ + + + + + + + diff --git a/mozilla/toolkit/content/widgets/tree.xml b/mozilla/toolkit/content/widgets/tree.xml index c405405acff..e8f1aba4c48 100644 --- a/mozilla/toolkit/content/widgets/tree.xml +++ b/mozilla/toolkit/content/widgets/tree.xml @@ -820,7 +820,7 @@ } else if (!this.disableKeyNavigation && event.charCode > 0 && !event.altKey && !this._isAccelPressed(event) && - !event.metaKey) { + !event.metaKey && !event.ctrlKey) { var l = this.keyNavigate(event); if (l >= 0) { this.view.selection.timedSelect(l, this._selectDelay);