Merge pull request #1845 from Jefiozie/625_refreshOnActive

fix(#271) if option is set the refresh function is getting the request.

Author: Jefiozie

src/uiSelectChoicesDirective.js

@@ -55,10 +55,8 @@ uis.directive('uiSelectChoices',
 
 
         $select.parseRepeatAttr(attrs.repeat, groupByExp, groupFilterExp); //Result ready at $select.parserResult
-
         $select.disableChoiceExpression = attrs.uiDisableChoice;
         $select.onHighlightCallback = attrs.onHighlight;
-
         $select.dropdownPosition = attrs.position ? attrs.position.toLowerCase() : uiSelectConfig.dropdownPosition;        
 
         scope.$watch('$select.search', function(newValue) {
@@ -79,7 +77,8 @@ uis.directive('uiSelectChoices',
 
         scope.$watch('$select.open', function(open) {
           if (open) {
-            element.attr('role', 'listbox');
+            tElement.attr('role', 'listbox');
+            $select.refresh(attrs.refresh);
           } else {
             element.removeAttr('role');
           }

src/uiSelectController.js

@@ -114,11 +114,8 @@ uis.controller('uiSelectCtrl',
       if(!avoidReset) _resetSearchInput();
 
       $scope.$broadcast('uis:activate');
-
       ctrl.open = true;
-
       ctrl.activeIndex = ctrl.activeIndex >= ctrl.items.length ? 0 : ctrl.activeIndex;
-
       // ensure that the index is set to zero for tagging variants
       // that where first option is auto-selected
       if ( ctrl.activeIndex === -1 && ctrl.taggingLabel !== false ) {
@@ -256,7 +253,6 @@ uis.controller('uiSelectCtrl',
       if (ctrl.dropdownPosition === 'auto' || ctrl.dropdownPosition === 'up'){
         $scope.calculateDropdownPos();
       }
-
       $scope.$broadcast('uis:refresh');
     };
 

test/select.spec.js

@@ -3231,7 +3231,31 @@ describe('ui-select tests', function() {
       expect(el.scope().$select.spinnerClass).toBe('randomclass');
     });
   });
+  
+  describe('With refresh on active', function(){
+    it('should refresh when is activated', function(){
+       scope.fetchFromServer = function(){};
+       var el = createUiSelect({refresh:"fetchFromServer($select.search)",refreshDelay:0});
+       spyOn(scope, 'fetchFromServer'); 
+       expect(el.scope().$select.open).toEqual(false);
+       el.scope().$select.activate();
+       $timeout.flush();
+       expect(el.scope().$select.open).toEqual(true);
+       expect(scope.fetchFromServer.calls.any()).toEqual(true);
+     });
+
 
+     it('should refresh when open is set to true', function(){
+       scope.fetchFromServer = function(){};
+       var el = createUiSelect({refresh:"fetchFromServer($select.search)",refreshDelay:0});
+       spyOn(scope, 'fetchFromServer'); 
+       expect(el.scope().$select.open).toEqual(false);
+       openDropdown(el);
+       $timeout.flush();
+       expect(el.scope().$select.open).toEqual(true);
+       expect(scope.fetchFromServer.calls.any()).toEqual(true);
+     });
+   });
    describe('Test key down key up and activeIndex should skip disabled choice',function(){
     it('should ignore disabled items, going down', function() {
       var el = createUiSelect({uiDisableChoice:"person.age == 12"});
@@ -3295,5 +3319,4 @@ describe('ui-select tests', function() {
       expect(el.scope().$select.activeIndex).toBe(2);
     });
   });
-
 });