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

Commit fd7fd90

Browse files
author
Kerry McCullough
committed
Better multiple check and test, and new test
1 parent f2e68f1 commit fd7fd90

File tree

6 files changed

+18
-11
lines changed

6 files changed

+18
-11
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.14.10 - 2016-03-07T18:29:24.965Z
4+
* Version: 0.14.11 - 2016-03-07T21:01:01.283Z
55
* License: MIT
66
*/
77

dist/select.js

Lines changed: 4 additions & 4 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.10 - 2016-03-07T18:29:24.905Z
4+
* Version: 0.14.11 - 2016-03-07T21:01:01.219Z
55
* License: MIT
66
*/
77

@@ -945,9 +945,9 @@ uis.directive('uiSelect',
945945
$select.ngModel = ngModel;
946946

947947
//Properly check for empty if set to multiple
948-
ngModel.$isEmpty = function(value) {
949-
return !value || angular.isDefined(attrs.multiple) && value.length === 0;
950-
};
948+
//ngModel.$isEmpty = function(value) {
949+
// return !value || angular.isDefined($select.multiple) && value.length === 0;
950+
//};
951951

952952
$select.choiceGrouped = function(group){
953953
return $select.isGrouped && group && group.name;

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.

src/uiSelectDirective.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ uis.directive('uiSelect',
6363

6464
//Properly check for empty if set to multiple
6565
ngModel.$isEmpty = function(value) {
66-
return !value || angular.isDefined(attrs.multiple) && value.length === 0;
66+
return !value || angular.isDefined($select.multiple) && value.length === 0;
6767
};
6868

6969
$select.choiceGrouped = function(group){

test/select.spec.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2221,9 +2221,16 @@ describe('ui-select tests', function() {
22212221
expect(searchEl[0].id).toEqual('inid');
22222222
});
22232223

2224-
it('should properly check for empty if required', function () {
2224+
it('should properly identify as empty if required', function () {
22252225
var el = createUiSelectMultiple({required: true});
2226-
expect(el.hasClass('ng-invalid-required')).toBeTruthy();
2226+
expect(el.hasClass('ng-empty')).toBeTruthy();
2227+
});
2228+
2229+
it('should properly identify as not empty if required', function () {
2230+
var el = createUiSelectMultiple({required: true});
2231+
clickItem(el, 'Nicole');
2232+
clickItem(el, 'Samantha');
2233+
expect(el.hasClass('ng-not-empty')).toBeTruthy();
22272234
});
22282235
});
22292236

0 commit comments

Comments
 (0)