Merge pull request angular-ui#484 from brianfeister/master

Fix for angular-ui/ui-select#327 (comment)
codedogfish · Dec 8, 2014 · 7c9dfc1 · 7c9dfc1
2 parents 90b7b14 + 011105b
commit 7c9dfc1
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 16 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ui-select",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "homepage": "https://github.com/angular-ui/ui-select",
   "authors": [
     "AngularUI"

diff --git a/dist/select.css b/dist/select.css
@@ -1,7 +1,7 @@
 /*!
  * ui-select
  * http://github.com/angular-ui/ui-select
- * Version: 0.9.1 - 2014-12-03T16:41:44.801Z
+ * Version: 0.9.2 - 2014-12-08T14:55:46.402Z
  * License: MIT
  */
 

diff --git a/dist/select.js b/dist/select.js
@@ -1,7 +1,7 @@
 /*!
  * ui-select
  * http://github.com/angular-ui/ui-select
- * Version: 0.9.1 - 2014-12-03T16:41:44.798Z
+ * Version: 0.9.2 - 2014-12-08T14:55:46.399Z
  * License: MIT
  */
 
@@ -623,7 +623,7 @@
               if ( ctrl.taggingTokens.tokens[i] === KEY.MAP[e.keyCode] ) {
                 // make sure there is a new value to push via tagging
                 if ( ctrl.search.length > 0 ) {
-                  ctrl.select(null, true);
+                  ctrl.select(undefined, true);
                   _searchInput.triggerHandler('tagged');
                 }
               }
@@ -712,7 +712,7 @@
           }
           // verify the the tag doesn't match the value of an existing item from
           // the searched data set
-          if ( stashArr.filter( function (origItem) { return origItem.toUpperCase() === ctrl.search.toUpperCase(); }).length > 0 ) {
+          if ( _findCaseInsensitiveDupe(stashArr) ) {
             // if there is a tag from prev iteration, strip it / queue the change
             // and return early
             if ( hasTag ) {
@@ -724,7 +724,7 @@
             }
             return;
           }
-          if ( ctrl.selected.filter( function (selection) { return selection.toUpperCase() === ctrl.search.toUpperCase(); } ).length > 0 ) {
+          if ( _findCaseInsensitiveDupe(stashArr) ) {
             // if there is a tag from prev iteration, strip it
             if ( hasTag ) {
               ctrl.items = stashArr.slice(1,stashArr.length);
@@ -760,6 +760,20 @@
       });
     });
 
+    function _findCaseInsensitiveDupe(arr) {
+      if ( arr === undefined || ctrl.search === undefined ) {
+        return false;
+      }
+      var hasDupe = arr.filter( function (origItem) {
+        if ( ctrl.search.toUpperCase() === undefined ) {
+          return false;
+        }
+        return origItem.toUpperCase() === ctrl.search.toUpperCase();
+      }).length > 0;
+
+      return hasDupe;
+    }
+
     function _findApproxDupe(haystack, needle) {
       var tempArr = angular.copy(haystack);
       var dupeIndex = -1;
@@ -845,7 +859,14 @@
             attrs.multiple.toLowerCase() === 'true'
         );
 
-        $select.closeOnSelect = (angular.isDefined(attrs.closeOnSelect) && attrs.closeOnSelect.toLowerCase() === 'false') ? false : uiSelectConfig.closeOnSelect;
+        $select.closeOnSelect = function() {
+          if (angular.isDefined(attrs.closeOnSelect)) {
+            return $parse(attrs.closeOnSelect)();
+          } else {
+            return uiSelectConfig.closeOnSelect;
+          }
+        }();
+
         $select.onSelectCallback = $parse(attrs.onSelect);
         $select.onRemoveCallback = $parse(attrs.onRemove);
 
@@ -1221,7 +1242,7 @@
         attrs.$observe('placeholder', function(placeholder) {
           $select.placeholder = placeholder !== undefined ? placeholder : uiSelectConfig.placeholder;
         });
-        
+
         $select.allowClear = (angular.isDefined(attrs.allowClear)) ? (attrs.allowClear === '') ? true : (attrs.allowClear.toLowerCase() === 'true') : false;
 
         if($select.multiple){

diff --git a/dist/select.min.css b/dist/select.min.css
diff --git a/dist/select.min.js b/dist/select.min.js
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "repository": {
     "url": "git://github.com/angular-ui/ui-select.git"
   },
-  "version": "0.9.1",
+  "version": "0.9.2",
   "devDependencies": {
     "bower": "~1.3",
     "del": "~0.1.1",

diff --git a/src/select.js b/src/select.js
@@ -615,7 +615,7 @@
               if ( ctrl.taggingTokens.tokens[i] === KEY.MAP[e.keyCode] ) {
                 // make sure there is a new value to push via tagging
                 if ( ctrl.search.length > 0 ) {
-                  ctrl.select(null, true);
+                  ctrl.select(undefined, true);
                   _searchInput.triggerHandler('tagged');
                 }
               }
@@ -704,7 +704,7 @@
           }
           // verify the the tag doesn't match the value of an existing item from
           // the searched data set
-          if ( stashArr.filter( function (origItem) { return origItem.toUpperCase() === ctrl.search.toUpperCase(); }).length > 0 ) {
+          if ( _findCaseInsensitiveDupe(stashArr) ) {
             // if there is a tag from prev iteration, strip it / queue the change
             // and return early
             if ( hasTag ) {
@@ -716,7 +716,7 @@
             }
             return;
           }
-          if ( ctrl.selected.filter( function (selection) { return selection.toUpperCase() === ctrl.search.toUpperCase(); } ).length > 0 ) {
+          if ( _findCaseInsensitiveDupe(stashArr) ) {
             // if there is a tag from prev iteration, strip it
             if ( hasTag ) {
               ctrl.items = stashArr.slice(1,stashArr.length);
@@ -752,6 +752,20 @@
       });
     });
 
+    function _findCaseInsensitiveDupe(arr) {
+      if ( arr === undefined || ctrl.search === undefined ) {
+        return false;
+      }
+      var hasDupe = arr.filter( function (origItem) {
+        if ( ctrl.search.toUpperCase() === undefined ) {
+          return false;
+        }
+        return origItem.toUpperCase() === ctrl.search.toUpperCase();
+      }).length > 0;
+
+      return hasDupe;
+    }
+
     function _findApproxDupe(haystack, needle) {
       var tempArr = angular.copy(haystack);
       var dupeIndex = -1;
@@ -1220,7 +1234,7 @@
         attrs.$observe('placeholder', function(placeholder) {
           $select.placeholder = placeholder !== undefined ? placeholder : uiSelectConfig.placeholder;
         });
-        
+
         $select.allowClear = (angular.isDefined(attrs.allowClear)) ? (attrs.allowClear === '') ? true : (attrs.allowClear.toLowerCase() === 'true') : false;
 
         if($select.multiple){