Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

Issue/#624 - Add extra handling for negative activeIndex. #638

Merged
merged 2 commits into from
Feb 6, 2015
Merged

Issue/#624 - Add extra handling for negative activeIndex. #638

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d6cd8b
Add missing negative activeIndex check just like in select2.js.
JeromeLam Feb 6, 2015
514940b
Cap activeIndex's minimum to -1.
JeromeLam Feb 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@
break;
case KEY.UP:
if (!ctrl.open && ctrl.multiple) ctrl.activate(false, true); //In case its the search input in 'multiple' mode
else if (ctrl.activeIndex > 0 || (ctrl.search.length === 0 && ctrl.tagging.isActivated)) { ctrl.activeIndex--; }
else if (ctrl.activeIndex > 0 || (ctrl.search.length === 0 && ctrl.tagging.isActivated && ctrl.activeIndex > -1)) { ctrl.activeIndex--; }
break;
case KEY.TAB:
if (!ctrl.multiple || ctrl.open) ctrl.select(ctrl.items[ctrl.activeIndex], true);
Expand Down Expand Up @@ -853,6 +853,10 @@
throw uiSelectMinErr('choices', "Expected multiple .ui-select-choices-row but got '{0}'.", choices.length);
}

if (ctrl.activeIndex < 0) {
return;
}

var highlighted = choices[ctrl.activeIndex];
var posY = highlighted.offsetTop + highlighted.clientHeight - container[0].scrollTop;
var height = container[0].offsetHeight;
Expand Down Expand Up @@ -1329,4 +1333,3 @@
};
});
}());