Commit 8ade8258 authored by Luke Bennett's avatar Luke Bennett

review changes

parent 2f8fada6
...@@ -31,9 +31,8 @@ ...@@ -31,9 +31,8 @@
this.input this.input
.on('keydown', function (e) { .on('keydown', function (e) {
var keyCode = e.which; var keyCode = e.which;
if (keyCode === 13) { if (keyCode === 13) {
e.preventDefault() e.preventDefault();
} }
}) })
.on('keyup', function(e) { .on('keyup', function(e) {
...@@ -179,7 +178,7 @@ ...@@ -179,7 +178,7 @@
})(); })();
GitLabDropdown = (function() { GitLabDropdown = (function() {
var ACTIVE_CLASS, FILTER_INPUT, INDETERMINATE_CLASS, LOADING_CLASS, PAGE_TWO_CLASS, currentIndex; var ACTIVE_CLASS, FILTER_INPUT, INDETERMINATE_CLASS, LOADING_CLASS, PAGE_TWO_CLASS, NON_SELECTABLE_CLASSES, SELECTABLE_CLASSES, currentIndex;
LOADING_CLASS = "is-loading"; LOADING_CLASS = "is-loading";
...@@ -219,7 +218,7 @@ ...@@ -219,7 +218,7 @@
if (this.options.data) { if (this.options.data) {
if (_.isObject(this.options.data) && !_.isFunction(this.options.data)) { if (_.isObject(this.options.data) && !_.isFunction(this.options.data)) {
this.fullData = this.options.data; this.fullData = this.options.data;
currentIndex = -1 currentIndex = -1;
this.parseData(this.options.data); this.parseData(this.options.data);
} else { } else {
this.remote = new GitLabDropdownRemote(this.options.data, { this.remote = new GitLabDropdownRemote(this.options.data, {
...@@ -619,7 +618,7 @@ ...@@ -619,7 +618,7 @@
if ($el.length) { if ($el.length) {
$el.first().trigger('click'); $el.first().trigger('click');
var href = $el.attr('href'); var href = $el.attr('href');
if (href && href !== '#') Turbolinks.visit(href); if (href && href !== '#') Turbolinks.visit(href);
} }
}; };
...@@ -655,8 +654,6 @@ ...@@ -655,8 +654,6 @@
return false; return false;
} }
if (currentKeyCode === 13 && currentIndex !== -1) { if (currentKeyCode === 13 && currentIndex !== -1) {
e.preventDefault()
e.stopImmediatePropagation()
return _this.selectRowAtIndex(currentIndex); return _this.selectRowAtIndex(currentIndex);
} }
}; };
...@@ -687,8 +684,8 @@ ...@@ -687,8 +684,8 @@
listItemBottom = listItemTop + listItemHeight; listItemBottom = listItemTop + listItemHeight;
if (!index) { if (!index) {
$dropdownContent.scrollTop(0) $dropdownContent.scrollTop(0)
} else if (index === ($listItems.length - 1)) { } else if (index === ($listItems.length - 1)) {
$dropdownContent.scrollTop($dropdownContent.prop('scrollHeight')); $dropdownContent.scrollTop($dropdownContent.prop('scrollHeight'));
} else if (listItemBottom > (dropdownContentBottom + dropdownScrollTop)) { } else if (listItemBottom > (dropdownContentBottom + dropdownScrollTop)) {
$dropdownContent.scrollTop(listItemBottom - dropdownContentBottom + CURSOR_SELECT_SCROLL_PADDING); $dropdownContent.scrollTop(listItemBottom - dropdownContentBottom + CURSOR_SELECT_SCROLL_PADDING);
} else if (listItemTop < (dropdownContentTop + dropdownScrollTop)) { } else if (listItemTop < (dropdownContentTop + dropdownScrollTop)) {
......
...@@ -226,11 +226,11 @@ ...@@ -226,11 +226,11 @@
this.restoreOriginalState(); this.restoreOriginalState();
break; break;
case KEYCODE.ENTER: case KEYCODE.ENTER:
this.disableAutocomplete(); this.disableAutocomplete();
break; break;
case KEYCODE.UP: case KEYCODE.UP:
case KEYCODE.DOWN: case KEYCODE.DOWN:
return; return;
default: default:
if (this.searchInput.val() === '') { if (this.searchInput.val() === '') {
this.disableAutocomplete(); this.disableAutocomplete();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment