Pass along cursor position from QueryBox

hammerlab · Dec 4, 2014 · a16ccab · a16ccab
1 parent 0a17fca
commit a16ccab
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/cycledash/static/js/QueryCompletion.js b/cycledash/static/js/QueryCompletion.js
@@ -103,7 +103,7 @@ function getInternalCompletions(query, parse, columnNames, cursorPosition) {
  * The cursor is assumed to be at the end of the string, unless specified.
  */
 function getCompletions(query, parse, columnNames, opt_cursorPosition) {
-  if (opt_cursorPosition !== undefined) {
+  if (opt_cursorPosition !== undefined && opt_cursorPosition < query.length) {
     return getInternalCompletions(query, parse, columnNames, opt_cursorPosition);
   }
 

diff --git a/cycledash/static/js/examine/components/QueryBox.js b/cycledash/static/js/examine/components/QueryBox.js
@@ -74,7 +74,9 @@ var QueryBox = React.createClass({
         minLength: 0
       }, {
         name: 'my-dataset',
-        source: completionSource
+        source: function(q, callback) {
+          return completionSource(q, callback, $input.get(0).selectionStart);
+        }
       })
       .on('input typeahead:autocompleted', handleChange)
       .on('keydown', (e) => {

diff --git a/tests/playground/typeahead.html b/tests/playground/typeahead.html
@@ -142,7 +142,7 @@ <h1>Typeahead CQL demo</h1>
         name: 'my-dataset',
         source: function(q, callback) {
           checkSyntax(q);
-          mySource(q, callback);
+          mySource(q, callback, $('#input').get(0).selectionStart);
         }
       })
       .on('change', checkSyntax);