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

Commit afe56df

Browse files
committed
Merge branch 'tagging-support'
Conflicts: dist/select.css dist/select.css.min.css dist/select.js dist/select.js.min.js
2 parents ba547ac + 17a2e6e commit afe56df

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

dist/select.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* ui-select
33
* http://github.com/angular-ui/ui-select
4-
* Version: 0.7.0 - 2014-10-06T11:45:24.369Z
4+
* Version: 0.7.0 - 2014-10-06T12:31:14.676Z
55
* License: MIT
66
*/
77

dist/select.css.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/select.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* ui-select
33
* http://github.com/angular-ui/ui-select
4-
* Version: 0.7.0 - 2014-10-06T11:45:24.366Z
4+
* Version: 0.7.0 - 2014-10-06T12:31:14.673Z
55
* License: MIT
66
*/
77

@@ -500,7 +500,7 @@
500500
processed = _handleMatchSelection(key);
501501
}
502502

503-
if (!processed && ctrl.items.length > 0) {
503+
if (!processed && (ctrl.items.length > 0 || ctrl.tagging.isActivated)) {
504504
processed = _handleDropDownSelection(key);
505505
}
506506

0 commit comments

Comments
 (0)