diff options
| author | Alon Levy <alon@pobox.com> | 2015-03-08 15:55:01 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-03-08 15:55:01 +0200 |
| commit | b3c5070632a339a1a8eb46c2a5c47a562ede7633 (patch) | |
| tree | ade8520ce92574eb5434084018e6cb2b0e20756c /src | |
| parent | 59c23de887c2938533b735f0dedbb788e22d0f6f (diff) | |
client/textanalyser_input: completer options: small rewrite
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/view/textanalyser_input.js | 13 |
1 files changed, 7 insertions, 6 deletions
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']; })); |
