Merge pull request #1573 from Slowvoice/master

fix (tagging): try all taggingTokens for splitting on paste

Author: user378230

src/uiSelectController.js

@@ -588,9 +588,18 @@ uis.controller('uiSelectCtrl',
     if (data && data.length > 0) {
       // If tagging try to split by tokens and add items
       if (ctrl.taggingTokens.isActivated) {
-        var separator = KEY.toSeparator(ctrl.taggingTokens.tokens[0]);
-        var items = data.split(separator || ctrl.taggingTokens.tokens[0]); // split by first token only
-        if (items && items.length > 0) {
+        var items = [];
+        for (var i = 0; i < ctrl.taggingTokens.tokens.length; i++) {  // split by first token that is contained in data
+          var separator = KEY.toSeparator(ctrl.taggingTokens.tokens[i]) || ctrl.taggingTokens.tokens[i];
+          if (data.indexOf(separator) > -1) {
+            items = data.split(separator);
+            break;  // only split by one token
+          }
+        }
+        if (items.length === 0) {
+          items = [data];
+        }
+        if (items.length > 0) {
         var oldsearch = ctrl.search;
           angular.forEach(items, function (item) {
             var newItem = ctrl.tagging.fct ? ctrl.tagging.fct(item) : item;

test/select.spec.js

@@ -2504,6 +2504,22 @@ describe('ui-select tests', function() {
       expect($(el).scope().$select.selected.length).toBe(3);
     });
 
+    it('should split pastes on tagging token that is not the first token', function() {
+      var el = createUiSelectMultiple({tagging: true, taggingTokens: ",|ENTER|TAB"});
+      clickMatch(el);
+      triggerPaste(el.find('input'), "tag1\ntag2\ntag3\ntag4");
+
+      expect($(el).scope().$select.selected).toEqual(['tag1', 'tag2', 'tag3', 'tag4']);
+    });
+
+    it('should split pastes only on first tagging token found in paste string', function() {
+      var el = createUiSelectMultiple({tagging: true, taggingTokens: ",|ENTER|TAB"});
+      clickMatch(el);
+      triggerPaste(el.find('input'), "tag1\ntag2\ntag3\ttag4");
+
+      expect($(el).scope().$select.selected).toEqual(['tag1', 'tag2', 'tag3\ttag4']);
+    });
+
     it('should add an id to the search input field', function () {
       var el = createUiSelectMultiple({inputId: 'inid'});
       var searchEl = $(el).find('input.ui-select-search');