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

Commit 3b1496c

Browse files
committed
chore(release): bump package version and update changelog
1 parent 8bca6f4 commit 3b1496c

File tree

6 files changed

+25
-11
lines changed

6 files changed

+25
-11
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
<a name="0.14.8"></a>
2+
## [0.14.8](https://github.com/angular-ui/ui-select/compare/v0.14.8...v0.14.8) (2016-02-18)
3+
4+
5+
6+
17
<a name="0.14.7"></a>
28
## [0.14.7](https://github.com/angular-ui/ui-select/compare/v0.14.7...v0.14.7) (2016-02-18)
39

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.14.8 - 2016-02-18T21:50:31.589Z
4+
* Version: 0.14.8 - 2016-02-18T22:01:43.880Z
55
* License: MIT
66
*/
77

dist/select.js

Lines changed: 14 additions & 6 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.14.8 - 2016-02-18T21:50:31.512Z
4+
* Version: 0.14.8 - 2016-02-18T22:01:43.792Z
55
* License: MIT
66
*/
77

@@ -750,6 +750,11 @@ uis.controller('uiSelectCtrl',
750750

751751
var key = e.which;
752752

753+
if (~[KEY.ENTER,KEY.ESC].indexOf(key)){
754+
e.preventDefault();
755+
e.stopPropagation();
756+
}
757+
753758
// if(~[KEY.ESC,KEY.TAB].indexOf(key)){
754759
// //TODO: SEGURO?
755760
// ctrl.close();
@@ -1285,7 +1290,10 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
12851290
$select = $scope.$select,
12861291
ngModel;
12871292

1288-
//Wait for link fn to inject it
1293+
if (angular.isUndefined($select.selected))
1294+
$select.selected = [];
1295+
1296+
//Wait for link fn to inject it
12891297
$scope.$evalAsync(function(){ ngModel = $scope.ngModel; });
12901298

12911299
ctrl.activeMatchIndex = -1;
@@ -1297,7 +1305,7 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
12971305

12981306
ctrl.refreshComponent = function(){
12991307
//Remove already selected items
1300-
//e.g. When user clicks on a selection, the selected array changes and
1308+
//e.g. When user clicks on a selection, the selected array changes and
13011309
//the dropdown should remove that item
13021310
$select.refreshItems();
13031311
$select.sizeSearchInput();
@@ -1399,7 +1407,7 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
13991407
};
14001408
if (!inputValue) return resultMultiple; //If ngModel was undefined
14011409
for (var k = inputValue.length - 1; k >= 0; k--) {
1402-
//Check model array of currently selected items
1410+
//Check model array of currently selected items
14031411
if (!checkFnMultiple($select.selected, inputValue[k])){
14041412
//Check model array of all items available
14051413
if (!checkFnMultiple(data, inputValue[k])){
@@ -1410,8 +1418,8 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
14101418
}
14111419
return resultMultiple;
14121420
});
1413-
1414-
//Watch for external model changes
1421+
1422+
//Watch for external model changes
14151423
scope.$watchCollection(function(){ return ngModel.$modelValue; }, function(newValue, oldValue) {
14161424
if (oldValue != newValue){
14171425
ngModel.$modelValue = null; //Force scope model value and ngModel value to be out of sync to re-run formatters

dist/select.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.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "git://github.com/angular-ui/ui-select.git"
88
},
99
"style": "dist/select.css",
10-
"version": "0.14.8",
10+
"version": "0.14.9",
1111
"devDependencies": {
1212
"bower": "~1.3",
1313
"conventional-changelog": "^0.5.3",

0 commit comments

Comments
 (0)