From 1b3f21704f5283e562d7bf8149a01da2436ca7f4 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu" <bzbarsky%mit.edu>
Date: Thu, 15 Jul 2004 06:13:35 +0000
Subject: [PATCH] Fix bug 248468 (choosing directory with keyboard chooses dir
 and saves the file; should just choose dir).  r=neil for xpfe, r=mconnor for
 toolkit, sr=jag

---
 toolkit/components/filepicker/content/filepicker.js  | 12 ++----------
 xpfe/components/filepicker/res/content/filepicker.js | 12 ++----------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/toolkit/components/filepicker/content/filepicker.js b/toolkit/components/filepicker/content/filepicker.js
index 030173da538..a20e7701dbe 100644
--- a/toolkit/components/filepicker/content/filepicker.js
+++ b/toolkit/components/filepicker/content/filepicker.js
@@ -479,16 +479,8 @@ function handleColumnClick(columnID) {
 function onKeypress(e) {
   if (e.keyCode == 8) /* backspace */
     goUp();
-  else if (e.keyCode == 13) { /* enter */
-    var fileList = treeView.selectedFiles;
-    if (fileList.length > 0) {
-      var file = fileList.queryElementAt(0, nsIFile);
-      if (file.isDirectory()) {
-        gotoDirectory(file);
-        e.preventDefault();
-      }
-    }
-  }
+
+  /* enter is handled by the ondialogaccept handler */
 }
 
 function doEnabling() {
diff --git a/xpfe/components/filepicker/res/content/filepicker.js b/xpfe/components/filepicker/res/content/filepicker.js
index 91fcb52b81b..c83fefc855f 100644
--- a/xpfe/components/filepicker/res/content/filepicker.js
+++ b/xpfe/components/filepicker/res/content/filepicker.js
@@ -496,16 +496,8 @@ function handleColumnClick(columnID) {
 function onKeypress(e) {
   if (e.keyCode == 8) /* backspace */
     goUp();
-  else if (e.keyCode == 13) { /* enter */
-    var fileList = treeView.selectedFiles;
-    if (fileList.length > 0) {
-      var file = fileList.queryElementAt(0, nsIFile);
-      if (file.isDirectory()) {
-        gotoDirectory(file);
-        e.preventDefault();
-      }
-    }
-  }
+
+  /* enter is handled by the ondialogaccept handler */
 }
 
 function doEnabling() {