Merge pull request #1563 from fiznool/fix/use-triple-equals-pr

user378230 · user378230 · commit 55e82e8f6008 · 2016-04-16T13:42:02.000+01:00
fix(uiSelectSingleDirective): strictly compare matching value
diff --git a/src/uiSelectSingleDirective.js b/src/uiSelectSingleDirective.js
@@ -25,7 +25,7 @@ uis.directive('uiSelectSingle', ['$timeout','$compile', function($timeout, $comp
           var checkFnSingle = function(d){
             locals[$select.parserResult.itemName] = d;
             result = $select.parserResult.modelMapper(scope, locals);
-            return result == inputValue;
+            return result === inputValue;
           };
           //If possible pass same object stored in $select.selected
           if ($select.selected && checkFnSingle($select.selected)) {
@@ -121,4 +121,4 @@ uis.directive('uiSelectSingle', ['$timeout','$compile', function($timeout, $comp
 
     }
   };
-}]);
+}]);
diff --git a/test/select.spec.js b/test/select.spec.js
@@ -443,7 +443,7 @@ describe('ui-select tests', function() {
   });
 
   it('should correctly render initial state with track by $index', function () {
-    
+
     var el = compileTemplate(
       '<ui-select ng-model="selection.selected"> \
         <ui-select-match placeholder="Pick one...">{{$select.selected.name}}</ui-select-match> \
@@ -776,6 +776,30 @@ describe('ui-select tests', function() {
 
   });
 
+  it('should correctly render initial state (with object as source) differentiating between falsy values', function() {
+    scope.items = [{
+      label: '-- None Selected --',
+      value: ''
+    }, {
+      label: 'Yes',
+      value: true
+    }, {
+      label: 'No',
+      value: false
+    }];
+
+    var el = compileTemplate(
+      '<ui-select ng-model="selection.selected"> \
+        <ui-select-match>{{ $select.selected.label }}</ui-select-match> \
+        <ui-select-choices repeat="item.value as item in items track by item.value">{{ item.label }}</ui-select-choices> \
+      </ui-select>'
+    );
+
+    scope.selection.selected = '';
+    scope.$digest();
+    expect(getMatchLabel(el)).toEqual('-- None Selected --');
+  });
+
   describe('disabled options', function() {
     function createUiSelect(attrs) {
       var attrsDisabled = '';
@@ -2310,7 +2334,7 @@ describe('ui-select tests', function() {
 
       expect(el.scope().$select.multiple).toBe(true);
     });
-    
+
     it('should preserve the model if tagging is enabled on select multiple', function() {
       scope.selection.selectedMultiple = ["I am not on the list of choices"];
 
