Replace escaped tagging tokens when tagging on ENTER or TAB with no tagging label (#5)

Author: lameyer

dist/select.css

@@ -1,7 +1,7 @@
 /*!
  * ui-select
  * http://github.com/angular-ui/ui-select
- * Version: 0.19.6 - 2017-06-14T06:02:26.871Z
+ * Version: 0.19.6 - 2017-06-14T23:04:00.478Z
  * License: MIT
  */
 

dist/select.js

@@ -1,7 +1,7 @@
 /*!
  * ui-select
  * http://github.com/angular-ui/ui-select
- * Version: 0.19.6 - 2017-06-14T06:02:26.658Z
+ * Version: 0.19.6 - 2017-06-14T23:04:00.285Z
  * License: MIT
  */
 
@@ -682,7 +682,9 @@ uis.controller('uiSelectCtrl',
           if ( ctrl.taggingLabel === false ) {
             if ( ctrl.activeIndex < 0 ) {
               if (item === undefined) {
-                item = ctrl.tagging.fct !== undefined ? ctrl.tagging.fct(ctrl.search) : ctrl.search;
+                // when pulling from ctrl.search, deal with tagging tokens
+                item = _replaceAllTaggingTokens(ctrl.search);
+                if (ctrl.tagging.fct) item = ctrl.tagging.fct(item);
               }
               if (!item || angular.equals( ctrl.items[0], item ) ) {
                 return;
@@ -894,6 +896,8 @@ uis.controller('uiSelectCtrl',
   }
 
   function _replaceTaggingTokens(search, token) {
+    if (token.length > 1) return search; // do not replace token if it is a special key
+
     var tokenRegex = new RegExp(token + '$');
     if ( ctrl.taggingTokenEscape ) {
       // replace escaped tagging tokens with just the token
@@ -908,6 +912,16 @@ uis.controller('uiSelectCtrl',
     return search;
   }
 
+  function _replaceAllTaggingTokens(search) {
+    if (ctrl.taggingTokens.isActivated) {
+      for (var i = 0; i < ctrl.taggingTokens.tokens.length; i++) {
+        var token = ctrl.taggingTokens.tokens[i];
+        search = _replaceTaggingTokens(search, token);
+      }
+    }
+    return search;
+  }
+
   // Bind to keyboard shortcuts
   ctrl.searchInput.on('keydown', function(e) {
 
@@ -1018,15 +1032,7 @@ uis.controller('uiSelectCtrl',
     if (ctrl.tagging.isActivated && ctrl.tagOnBlur) {
       $timeout(function() {
         ctrl.searchInput.triggerHandler('tagged');
-        var newItem = ctrl.search;
-
-        // replace all tagging tokens
-        if (ctrl.taggingTokens.isActivated) {
-          for (var i = 0; i < ctrl.taggingTokens.tokens.length; i++) {
-            newItem = _replaceTaggingTokens(newItem, ctrl.taggingTokens.tokens[i]);
-          }
-        }
-
+        var newItem = _replaceAllTaggingTokens(ctrl.search);
         if ( ctrl.tagging.fct ) {
           newItem = ctrl.tagging.fct( newItem );
         }

dist/select.min.css

@@ -402,7 +402,9 @@ uis.controller('uiSelectCtrl',
           if ( ctrl.taggingLabel === false ) {
             if ( ctrl.activeIndex < 0 ) {
               if (item === undefined) {
-                item = ctrl.tagging.fct !== undefined ? ctrl.tagging.fct(ctrl.search) : ctrl.search;
+                // when pulling from ctrl.search, deal with tagging tokens
+                item = _replaceAllTaggingTokens(ctrl.search);
+                if (ctrl.tagging.fct) item = ctrl.tagging.fct(item);
               }
               if (!item || angular.equals( ctrl.items[0], item ) ) {
                 return;
@@ -614,6 +616,8 @@ uis.controller('uiSelectCtrl',
   }
 
   function _replaceTaggingTokens(search, token) {
+    if (token.length > 1) return search; // do not replace token if it is a special key
+
     var tokenRegex = new RegExp(token + '$');
     if ( ctrl.taggingTokenEscape ) {
       // replace escaped tagging tokens with just the token
@@ -628,6 +632,16 @@ uis.controller('uiSelectCtrl',
     return search;
   }
 
+  function _replaceAllTaggingTokens(search) {
+    if (ctrl.taggingTokens.isActivated) {
+      for (var i = 0; i < ctrl.taggingTokens.tokens.length; i++) {
+        var token = ctrl.taggingTokens.tokens[i];
+        search = _replaceTaggingTokens(search, token);
+      }
+    }
+    return search;
+  }
+
   // Bind to keyboard shortcuts
   ctrl.searchInput.on('keydown', function(e) {
 
@@ -738,15 +752,7 @@ uis.controller('uiSelectCtrl',
     if (ctrl.tagging.isActivated && ctrl.tagOnBlur) {
       $timeout(function() {
         ctrl.searchInput.triggerHandler('tagged');
-        var newItem = ctrl.search;
-
-        // replace all tagging tokens
-        if (ctrl.taggingTokens.isActivated) {
-          for (var i = 0; i < ctrl.taggingTokens.tokens.length; i++) {
-            newItem = _replaceTaggingTokens(newItem, ctrl.taggingTokens.tokens[i]);
-          }
-        }
-
+        var newItem = _replaceAllTaggingTokens(ctrl.search);
         if ( ctrl.tagging.fct ) {
           newItem = ctrl.tagging.fct( newItem );
         }

dist/select.min.js

@@ -2854,6 +2854,22 @@ describe('ui-select tests', function() {
       expect($(el).scope().$select.selected).toEqual(['tag,']);
     });
 
+    it('should convert escaped token to token when tagging with ENTER with no tagging label', function () {
+      var el = createUiSelectMultiple({tagging: true, taggingTokenEscape: '^', taggingTokens: ',', taggingLabel: 'false'});
+      var searchInput = el.find('.ui-select-search');
+      setSearchText(el, 'tag^,');
+      triggerKeydown(searchInput, Key.Enter);
+      expect($(el).scope().$select.selected).toEqual(['tag,']);
+    });
+
+    it('should convert escaped token to token when tagging with TAB with no tagging label', function () {
+      var el = createUiSelectMultiple({tagging: true, taggingTokenEscape: '^', taggingTokens: ',', taggingLabel: 'false'});
+      var searchInput = el.find('.ui-select-search');
+      setSearchText(el, 'tag^,');
+      triggerKeydown(searchInput, Key.Tab);
+      expect($(el).scope().$select.selected).toEqual(['tag,']);
+    });
+
     it('should not remove tagging token in the middle', function () {
       var el = createUiSelectMultiple({tagging: true, taggingTokenEscape: '^', taggingTokens: ','});
       var searchInput = el.find('.ui-select-search');