From b03fc5ad6bb3a8f2bd060cc10e6b4679308a021a Mon Sep 17 00:00:00 2001
From: Alon Levy <alon@pobox.com>
Date: Mon, 9 Mar 2015 20:23:25 +0200
Subject: client/view/search: use FRP

---
 src/client/view/search.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/client/view')

diff --git a/src/client/view/search.js b/src/client/view/search.js
index 09950687..fdadc16d 100644
--- a/src/client/view/search.js
+++ b/src/client/view/search.js
@@ -18,15 +18,16 @@ function init() {
                                  });
 
     search_completer.options.plug(textanalysis.suggestions_options.map('.nodes'));
-    search.on('input', search_on_submit);
-    search.on('keydown', function(e) {
-        if (e.which == 13 && !search_completer.handleEnter()) {
-            e.preventDefault();
-            search_on_submit(e);
-            return false;
-        }
-        return true;
-    });
+    search.asEventStream('input')
+        .merge(search.asEventStream('keydown').filter(
+            function(e) {
+            if (e.which == 13 && !search_completer.handleEnter()) {
+                e.preventDefault();
+                return false;
+            }
+            return true;
+        }))
+        .onValue(search_on_submit);
 
     function attribute_match(obj, regexp) {
         var v, k;
-- 
cgit v1.3.1