diff options
| author | Alon Levy <alon@pobox.com> | 2015-03-08 14:54:52 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-03-08 14:54:52 +0200 |
| commit | 84cf1a4f50ef5b5094b4e250b664fb0e7089ee10 (patch) | |
| tree | f851cd1ac9ad1659662a8319850a214c5f5e60f7 | |
| parent | 60d25c22542160845cd025cfa4368c61963659d3 (diff) | |
textanalyuser_input: provide bus for analysis results events (post analysis, required for completion updates)
| -rw-r--r-- | src/client/textanalysis.ui.js | 6 | ||||
| -rw-r--r-- | src/client/view/textanalyser_input.js | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/client/textanalysis.ui.js b/src/client/textanalysis.ui.js index e5d3f314..50cabdd1 100644 --- a/src/client/textanalysis.ui.js +++ b/src/client/textanalysis.ui.js @@ -131,11 +131,11 @@ function changeType(up) var main = function () { input.on_sentence.onValue(submitNewSentence); - input.on_analysis.onValue(function (sentence) { - analyzeSentence({ + input.on_analysis__input.onValue(function (sentence) { + input.on_analysis__output.push(analyzeSentence({ sentence: sentence, finalize: false, - }); + })); }); input.on_type.onValue(function (up) { if (textanalysis.lastnode(rz_core.edit_graph, input.selectionStart())) { diff --git a/src/client/view/textanalyser_input.js b/src/client/view/textanalyser_input.js index 15b59776..184402b1 100644 --- a/src/client/view/textanalyser_input.js +++ b/src/client/view/textanalyser_input.js @@ -71,7 +71,8 @@ function textanalyser_input(spec) { var element_name = spec.element_name, ta = { spec: spec, - on_analysis: new Bacon.Bus(), + on_analysis__input: new Bacon.Bus(), + on_analysis__output: new Bacon.Bus(), on_resize: new Bacon.Bus(), element: $(element_name), selectionStart: selectionStart, @@ -121,7 +122,7 @@ function textanalyser_input(spec) { } ta.on_sentence = enters.filter(function (v) { return v !== false; }); - ta.on_analysis.plug(enters.filter(function (v) { return v === false; }).map(current_value)); + ta.on_analysis__input.plug(enters.filter(function (v) { return v === false; }).map(current_value)); ta.on_type = stream_shift_key(VK_UP).map(true).merge(stream_shift_key(VK_DOWN).map(false)); element.asEventStream('keydown').onValue(function (e) { @@ -134,7 +135,7 @@ function textanalyser_input(spec) { e.preventDefault(); }); - ta.on_analysis.plug(element.asEventStream('input').map(current_value).map(function (val) { + ta.on_analysis__input.plug(element.asEventStream('input').map(current_value).map(function (val) { return update_element(val); })); |
