Merge pull request #273 from angular-ui/perf_choices_active_disabled

feat(choices): prevent calling $select.isActive/isDisabled when dropdown...

Author: dimirc

src/select.js

@@ -304,10 +304,13 @@
     };
 
     ctrl.isActive = function(itemScope) {
-      return ctrl.items.indexOf(itemScope[ctrl.itemProperty]) === ctrl.activeIndex;
+      return ctrl.open && ctrl.items.indexOf(itemScope[ctrl.itemProperty]) === ctrl.activeIndex;
     };
 
     ctrl.isDisabled = function(itemScope) {
+      
+      if (!ctrl.open) return;
+
       var itemIndex = ctrl.items.indexOf(itemScope[ctrl.itemProperty]);
       var isDisabled = false;
       var item;

test/select.spec.js

@@ -85,6 +85,11 @@ describe('ui-select tests', function() {
   }
 
   function clickItem(el, text) {
+
+    if (!isDropdownOpened(el)){
+      openDropdown(el);
+    }
+
     $(el).find('.ui-select-choices-row div:contains("' + text + '")').click();
     scope.$digest();
   }
@@ -114,6 +119,13 @@ describe('ui-select tests', function() {
     $timeout.flush();
   }
 
+  function openDropdown(el) {
+    var $select = el.scope().$select;
+    $select.open = true;
+    scope.$digest();
+  };
+
+
   // Tests
 
   it('should compile child directives', function() {
@@ -357,6 +369,8 @@ describe('ui-select tests', function() {
         var option = $(this.el).find('.ui-select-choices-row div:contains("Wladimir")');
         var container = option.closest('.ui-select-choices-row');
 
+        openDropdown(this.el);
+
         expect(container.hasClass('disabled')).toBeTruthy();
       });
     });
@@ -386,6 +400,8 @@ describe('ui-select tests', function() {
         var option = $(this.el).find('.ui-select-choices-row div:contains("Wladimir")');
         var container = option.closest('.ui-select-choices-row');
 
+        openDropdown(this.el);
+
         expect(container.hasClass('disabled')).toBeTruthy();
       });
     });
@@ -415,6 +431,8 @@ describe('ui-select tests', function() {
         var option = $(this.el).find('.ui-select-choices-row div:contains("Wladimir")');
         var container = option.closest('.ui-select-choices-row');
 
+        openDropdown(this.el);
+
         expect(container.hasClass('disabled')).toBeTruthy();
       });
     });
@@ -467,6 +485,9 @@ describe('ui-select tests', function() {
       el.scope().$select.search = 't';
       scope.$digest();
       var choices = el.find('.ui-select-choices-row');
+      
+      openDropdown(el);
+      
       expect(choices.eq(0)).toHaveClass('active');
       expect(getGroupLabel(choices.eq(0)).text()).toBe('Foo');