Ctrl-s to focus search field, refs #57

meemoo · Oct 2, 2013 · 8ef3029 · 8ef3029
1 parent 2a28c5f
commit 8ef3029
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/build/dataflow.build.js b/build/dataflow.build.js
@@ -1,4 +1,4 @@
-/*! dataflow.js - v0.0.7 - 2013-10-02 (7:09:36 PM GMT+0200)
+/*! dataflow.js - v0.0.7 - 2013-10-02 (7:36:38 PM GMT+0200)
 * Copyright (c) 2013 Forrest Oliphant; Licensed MIT, GPL */
 // Thanks bobnice http://stackoverflow.com/a/1583281/592125
 
@@ -3638,9 +3638,9 @@ CircularBuffer.IndexError= {};
 
   var KeyBinding = Dataflow.prototype.plugin("keybinding");
   var Edit = Dataflow.prototype.plugin("edit");
+  var Search = Dataflow.prototype.plugin("search");
 
   KeyBinding.initialize = function(dataflow){
-
     function zoomIn() {
       if (dataflow && dataflow.currentGraph && dataflow.currentGraph.view) {
         dataflow.currentGraph.view.zoomIn();
@@ -3694,6 +3694,10 @@ CircularBuffer.IndexError= {};
             break;
           case 90: // z
             break;
+          case 83: // s
+            event.preventDefault();
+            Search.focus();
+            break;
           default:
             break;
         }
@@ -3829,6 +3833,10 @@ CircularBuffer.IndexError= {};
     $button.on('click', function () {
       dataflow.showPlugin('menu');
     });
+
+    Search.focus = function () {
+      $input.focus();
+    };
   };
 
   Search.search = function (text, dataflow) {

diff --git a/build/dataflow.min.js b/build/dataflow.min.js
diff --git a/build/dataflow.min.js.map b/build/dataflow.min.js.map
diff --git a/src/plugins/keybinding.js b/src/plugins/keybinding.js
@@ -5,9 +5,9 @@
 
   var KeyBinding = Dataflow.prototype.plugin("keybinding");
   var Edit = Dataflow.prototype.plugin("edit");
+  var Search = Dataflow.prototype.plugin("search");
 
   KeyBinding.initialize = function(dataflow){
-
     function zoomIn() {
       if (dataflow && dataflow.currentGraph && dataflow.currentGraph.view) {
         dataflow.currentGraph.view.zoomIn();
@@ -61,6 +61,10 @@
             break;
           case 90: // z
             break;
+          case 83: // s
+            event.preventDefault();
+            Search.focus();
+            break;
           default:
             break;
         }

diff --git a/src/plugins/search.js b/src/plugins/search.js
@@ -55,6 +55,10 @@
     $button.on('click', function () {
       dataflow.showPlugin('menu');
     });
+
+    Search.focus = function () {
+      $input.focus();
+    };
   };
 
   Search.search = function (text, dataflow) {