Merge pull request #17 from looker/rlm1023/massive-paste-performance

Fix performance when pasting thousands of values.

Author: Robert Miller

dist/select.css

@@ -1,7 +1,7 @@
 /*!
  * ui-select
  * http://github.com/angular-ui/ui-select
- * Version: 0.19.8 - 2017-08-16T19:47:39.450Z
+ * Version: 0.19.8 - 2017-11-06T21:30:55.941Z
  * License: MIT
  */
 

dist/select.js

@@ -1,7 +1,7 @@
 /*!
  * ui-select
  * http://github.com/angular-ui/ui-select
- * Version: 0.19.8 - 2017-08-16T19:47:39.332Z
+ * Version: 0.19.8 - 2017-11-06T21:30:55.814Z
  * License: MIT
  */
 
@@ -1024,9 +1024,7 @@ uis.controller('uiSelectCtrl',
         var pastedItems = ctrl.paste(data);
         // broadcast selected items if paste function returns them
         if (pastedItems && pastedItems.length) {
-          pastedItems.forEach(function(item) {
-            $scope.$broadcast('uis:select', item);
-          });
+          $scope.$broadcast('uis:select-multiple', pastedItems);
         }
         ctrl.search = EMPTY_SEARCH;
         e.preventDefault();
@@ -1944,6 +1942,14 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
         $selectMultiple.updateModel();
       });
 
+      scope.$on('uis:select-multiple', function (event, items) {
+        if ($select.selected.length >= $select.limit) {
+          return;
+        }
+        $select.selected = $select.selected.concat(items);
+        $selectMultiple.updateModel();
+      });
+
       scope.$on('uis:activate', function () {
         $selectMultiple.allChoicesActive = false;
         $selectMultiple.activeMatchIndex = -1;

dist/select.min.css

@@ -728,9 +728,7 @@ uis.controller('uiSelectCtrl',
         var pastedItems = ctrl.paste(data);
         // broadcast selected items if paste function returns them
         if (pastedItems && pastedItems.length) {
-          pastedItems.forEach(function(item) {
-            $scope.$broadcast('uis:select', item);
-          });
+          $scope.$broadcast('uis:select-multiple', pastedItems);
         }
         ctrl.search = EMPTY_SEARCH;
         e.preventDefault();

dist/select.min.js

@@ -212,6 +212,14 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
         $selectMultiple.updateModel();
       });
 
+      scope.$on('uis:select-multiple', function (event, items) {
+        if ($select.selected.length >= $select.limit) {
+          return;
+        }
+        $select.selected = $select.selected.concat(items);
+        $selectMultiple.updateModel();
+      });
+
       scope.$on('uis:activate', function () {
         $selectMultiple.allChoicesActive = false;
         $selectMultiple.activeMatchIndex = -1;

dist/select.min.js.map

@@ -2902,8 +2902,21 @@ describe('ui-select tests', function () {
       clickMatch(el);
       triggerPaste(el.find('input'), 'tag1');
 
-      expect(scope.$broadcast).toHaveBeenCalledWith('uis:select', 'tag1');
-    })
+      expect(scope.$broadcast).not.toHaveBeenCalledWith('uis:select', 'tag1');
+      expect(scope.$broadcast).toHaveBeenCalledWith('uis:select-multiple', ['tag1']);
+    });
+
+    it('should broadcast pasted items once regardless of paste size', function() {
+      scope.pasteFunc = function(str) { return str.split(",") };
+      spyOn(scope, '$broadcast');
+
+      var el = createUiSelectMultiple({tagging: true, paste: "pasteFunc", taggingTokens: ","});
+      clickMatch(el);
+      triggerPaste(el.find('input'), 'tag1,tag2,tag3');
+
+      expect(scope.$broadcast).not.toHaveBeenCalledWith('uis:select', 'tag1');
+      expect(scope.$broadcast).toHaveBeenCalledWith('uis:select-multiple', ['tag1', 'tag2', 'tag3']);
+    });
 
     it('should not broadcast if paste function does not return pasted items', function() {
       scope.pasteFunc = function() {};
@@ -2913,8 +2926,8 @@ describe('ui-select tests', function () {
       clickMatch(el);
       triggerPaste(el.find('input'), 'tag1');
 
-      expect(scope.$broadcast).not.toHaveBeenCalledWith('uis:select', 'tag1');
-    })
+      expect(scope.$broadcast).not.toHaveBeenCalledWith('uis:select-multiple', ['tag1']);
+    });
 
     it('should add an id to the search input field', function () {
       var el = createUiSelectMultiple({ inputId: 'inid' });