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

Commit d5289ee

Browse files
committed
chore(build): v0.5.4
1 parent 6dfc5d0 commit d5289ee

File tree

6 files changed

+22
-11
lines changed

6 files changed

+22
-11
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ui-select",
3-
"version": "0.5.3",
3+
"version": "0.5.4",
44
"homepage": "https://github.com/angular-ui/ui-select",
55
"authors": [
66
"AngularUI"

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.5.3 - 2014-08-03T03:25:32.538Z
4+
* Version: 0.5.4 - 2014-08-04T19:03:12.161Z
55
* License: MIT
66
*/
77

dist/select.js

Lines changed: 16 additions & 5 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.5.3 - 2014-08-03T03:25:32.534Z
4+
* Version: 0.5.4 - 2014-08-04T19:03:12.158Z
55
* License: MIT
66
*/
77

@@ -119,7 +119,7 @@
119119
ctrl.refreshDelay = undefined; // Initialized inside uiSelectChoices directive link function
120120

121121
ctrl.isEmpty = function() {
122-
return angular.isUndefined(ctrl.selected) || ctrl.selected === null;
122+
return angular.isUndefined(ctrl.selected) || ctrl.selected === null || ctrl.selected === '';
123123
};
124124

125125
var _searchInput = $element.querySelectorAll('input.ui-select-search');
@@ -237,6 +237,15 @@
237237

238238
// When the user clicks on an item inside the dropdown
239239
ctrl.select = function(item) {
240+
241+
var locals = {};
242+
locals[ctrl.parserResult.itemName] = item;
243+
244+
ctrl.onSelectCallback($scope, {
245+
$item: item,
246+
$model: ctrl.parserResult.modelMapper($scope, locals)
247+
});
248+
240249
ctrl.selected = item;
241250
ctrl.close();
242251
// Using a watch instead of $scope.ngModel.$setViewValue(item)
@@ -249,7 +258,7 @@
249258
ctrl.open = false;
250259
$timeout(function(){
251260
ctrl.focusser[0].focus();
252-
});
261+
},0,false);
253262
}
254263
};
255264

@@ -335,8 +344,8 @@
335344
}])
336345

337346
.directive('uiSelect',
338-
['$document', 'uiSelectConfig', 'uiSelectMinErr', '$compile',
339-
function($document, uiSelectConfig, uiSelectMinErr, $compile) {
347+
['$document', 'uiSelectConfig', 'uiSelectMinErr', '$compile', '$parse',
348+
function($document, uiSelectConfig, uiSelectMinErr, $compile, $parse) {
340349

341350
return {
342351
restrict: 'EA',
@@ -356,6 +365,8 @@
356365
var $select = ctrls[0];
357366
var ngModel = ctrls[1];
358367

368+
$select.onSelectCallback = $parse(attrs.onSelect);
369+
359370
//From view --> model
360371
ngModel.$parsers.unshift(function (inputValue) {
361372
var locals = {};

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
@@ -5,7 +5,7 @@
55
"repository": {
66
"url": "git://github.com/angular-ui/ui-select.git"
77
},
8-
"version": "0.5.3",
8+
"version": "0.5.4",
99
"devDependencies": {
1010
"bower": "~1.3",
1111
"del": "~0.1.1",

0 commit comments

Comments
 (0)