Chore (build v.0.9.5)

angular-ui · Dec 12, 2014 · aa13ee3 · aa13ee3
1 parent 41ba28f
commit aa13ee3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
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.4 - 2014-12-09T22:43:18.215Z
+ * Version: 0.9.5 - 2014-12-12T16:07:20.859Z
  * 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.4 - 2014-12-09T22:43:18.211Z
+ * Version: 0.9.5 - 2014-12-12T16:07:20.856Z
  * License: MIT
  */
 
@@ -411,8 +411,15 @@
                 // ctrl.tagging pushes items to ctrl.items, so we only have empty val
                 // for `item` if it is a detected duplicate
                 if ( item === undefined ) return;
-                // create new item on the fly
-                item = ctrl.tagging.fct !== undefined ? ctrl.tagging.fct(ctrl.search) : item.replace(ctrl.taggingLabel,'');
+
+                // create new item on the fly if we don't already have one;
+                // use tagging function if we have one
+                if ( ctrl.tagging.fct !== undefined && typeof item === 'string' ) {
+                  item = ctrl.tagging.fct(ctrl.search);
+                // if item type is 'string', apply the tagging label
+                } else if ( typeof item === 'string' ) {
+                  item = item.replace(ctrl.taggingLabel,'');
+                }
               }
             }
             // search ctrl.selected for dupes potentially caused by tagging and return early if found
@@ -463,9 +470,9 @@
     // Toggle dropdown
     ctrl.toggle = function(e) {
       if (ctrl.open) {
-        ctrl.close(); 
+        ctrl.close();
         e.preventDefault();
-        e.stopPropagation();        
+        e.stopPropagation();
       } else {
         ctrl.activate();
       }
@@ -654,7 +661,7 @@
             }
             if ( tagged ) {
               $timeout(function() {
-                _searchInput.triggerHandler('tagged', ctrl.items);
+                _searchInput.triggerHandler('tagged');
                 var newItem = ctrl.search.replace(KEY.MAP[e.keyCode],'').trim();
                 if ( ctrl.tagging.fct ) {
                   newItem = ctrl.tagging.fct( newItem );

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.4",
+  "version": "0.9.5",
   "devDependencies": {
     "bower": "~1.3",
     "del": "~0.1.1",