merge in the focus fix
authorDion Almaer <dion@mozilla.com>
Fri, 10 Apr 2009 21:27:06 -0700
changeset 1076 27403fea2c1c3505f0c6beeac33d814754a20d0f
parent 1074 a307f9666f971acf9d8d703cb09364edc8dbb18e (current diff)
parent 1075 437b28e51750a168c9ca024bb7d897d9280e9cf3 (diff)
child 1077 d4c1531d9925537a77bfbf18ea62b509df68c872
push id564
push userdalmaer@mozilla.com
push dateSat, 11 Apr 2009 04:27:09 +0000
merge in the focus fix
--- a/frontend/js/bespin/page/dashboard/init.js
+++ b/frontend/js/bespin/page/dashboard/init.js
@@ -394,16 +394,19 @@ dojo.provide("bespin.page.dashboard.init
         // provide history for the dashboard
         bespin.subscribe("url:changed", function(e) {
             var pathSelected =  (new bespin.client.settings.URL()).get('path');
             bespin.page.dashboard.restorePath(pathSelected);
         });
         
         // provide arrow navigation to dashboard
         dojo.connect(window, "keydown", dojo.hitch(tree, function(e) {
+            // catch focus on commandline
+            if(commandLine.handleCommandLineFocus(e)) return false;
+
             var key = bespin.util.keys.Key;
             var path = this.getSelectedPath();
             // things to make life much more easy :)
             var index = path.length - 1;
             var list = this.lists[index];
             var listNext = (this.lists.length > index ? this.lists[index + 1] : false);
             var listPre = (index != 0 ? this.lists[index - 1] : false);
             
@@ -433,9 +436,9 @@ dojo.provide("bespin.page.dashboard.init
                     this.bus.fire("dblclick", e, tree);
                     break;
             }
         }));
         
         // Set up message retrieval
         server.processMessages();
     });
-})();
\ No newline at end of file
+})();