summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-01-20 14:06:34 +0000
committerPhil Hughes <me@iamphill.com>2017-01-21 20:05:02 +0000
commit1980403c149f7ec59a8c215950c33fd4a81c024c (patch)
treeaa1132559f8b6288c5a1851805150f3cb661f7e9
parent80c0b877d966226a8f31ea199c6cfc5cf4bf9527 (diff)
downloadgitlab-ce-1980403c149f7ec59a8c215950c33fd4a81c024c.tar.gz
Fixed caret not moving correctly
-rw-r--r--app/assets/javascripts/filtered_search/dropdown_utils.js.es62
-rw-r--r--app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es62
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/filtered_search/dropdown_utils.js.es6 b/app/assets/javascripts/filtered_search/dropdown_utils.js.es6
index 54792f987b0..86fcc8f2612 100644
--- a/app/assets/javascripts/filtered_search/dropdown_utils.js.es6
+++ b/app/assets/javascripts/filtered_search/dropdown_utils.js.es6
@@ -99,7 +99,7 @@
right += selectionStart;
}
- let left = inputValue.slice(0, right).search(/\S+$/);
+ let left = inputValue.slice(0, selectionStart + 1).search(/\S+$/);
if (selectionStart === 0) {
left = 0;
diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6 b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6
index cd0f41eb8ef..fc00e77ae7f 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6
+++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6
@@ -85,7 +85,7 @@
right = inputValue.length;
}
- input.setSelectionRange(selectionStart + right, selectionStart);
+ input.setSelectionRange(right, right);
}
updateCurrentDropdownOffset() {