From b3c5070632a339a1a8eb46c2a5c47a562ede7633 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Sun, 8 Mar 2015 15:55:01 +0200 Subject: client/textanalyser_input: completer options: small rewrite --- src/client/view/textanalyser_input.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/client/view/textanalyser_input.js b/src/client/view/textanalyser_input.js index 5ac72a72..113489aa 100644 --- a/src/client/view/textanalyser_input.js +++ b/src/client/view/textanalyser_input.js @@ -92,15 +92,16 @@ function textanalyser_input(spec) { input_bus = new Bacon.Bus(), selectionBus = element.asEventStream('selectstart input keyup').map(selectionStart).skipDuplicates(); + function first_argument(one, two) { return one; }; + analysisCompleter.options.plug( textanalysis.suggestions_options - .combine(selectionBus, function (options, cursor) { return [options, cursor]; }) - .combine(ta.on_analysis__output, function (both, output) { return both; }) + .combine(selectionBus, first_argument) + .combine(ta.on_analysis__output, first_argument) .map( - function (both) { - var options = both[0], - cursor = both[1], - is_link = textanalysis.element_at_position__is_link(cursor); + function (options) { + var is_link = textanalysis.element_at_position__is_link(selectionStart()); + return options[is_link ? 'links' : 'nodes']; })); -- cgit v1.3.1