fix(angular-ui#271) if option is set only on activate the refresh function is getting the request.

Author: Jefiozie

src/uiSelectChoicesDirective.js

@@ -55,10 +55,9 @@ uis.directive('uiSelectChoices',
 
 
         $select.parseRepeatAttr(attrs.repeat, groupByExp, groupFilterExp); //Result ready at $select.parserResult
-
+        $select.refreshOnActive = scope.$eval(attrs.refreshOnActive);
         $select.disableChoiceExpression = attrs.uiDisableChoice;
         $select.onHighlightCallback = attrs.onHighlight;
-
         $select.dropdownPosition = attrs.position ? attrs.position.toLowerCase() : uiSelectConfig.dropdownPosition;        
 
         scope.$on('$destroy', function() {
@@ -68,7 +67,7 @@ uis.directive('uiSelectChoices',
         scope.$watch('$select.search', function(newValue) {
           if(newValue && !$select.open && $select.multiple) $select.activate(false, true);
           $select.activeIndex = $select.tagging.isActivated ? -1 : 0;
-          if (!attrs.minimumInputLength || $select.search.length >= attrs.minimumInputLength) {
+          if ((!attrs.minimumInputLength || $select.search.length >= attrs.minimumInputLength) && (!$select.refreshOnActive || ($select.refreshOnActive && $select.refreshIsActive))) {
             $select.refresh(attrs.refresh);
           } else {
             $select.items = [];
@@ -81,6 +80,15 @@ uis.directive('uiSelectChoices',
           $select.refreshDelay = refreshDelay !== undefined ? refreshDelay : uiSelectConfig.refreshDelay;
         });
 
+        if(!angular.isUndefined($select.refreshOnActive)){
+          //only add a watch when refreshonactive is set.
+          scope.$watch('$select.refreshIsActive', function(newValue, oldValue){
+            if(angular.isUndefined(oldValue) && newValue){
+              $select.refresh(attrs.refresh);
+            }
+          });
+        }
+        
         scope.$watch('$select.open', function(open) {
           if (open) {
             tElement.attr('role', 'listbox');

src/uiSelectController.js

@@ -19,6 +19,8 @@ uis.controller('uiSelectCtrl',
   ctrl.paste = uiSelectConfig.paste;
   ctrl.resetSearchInput = uiSelectConfig.resetSearchInput;
   ctrl.refreshing = false;
+  ctrl.refreshOnActive = undefined;
+  ctrl.refreshIsActive = undefined;
   ctrl.spinnerEnabled = uiSelectConfig.spinnerEnabled;
   ctrl.spinnerClass = uiSelectConfig.spinnerClass;
 
@@ -109,6 +111,14 @@ uis.controller('uiSelectCtrl',
       return result;
     }
 
+    function _setrefreshIsActive(){
+      //only set a value if the refreshOnActive attr is set.
+      if(!angular.isUndefined(ctrl.refreshOnActive))
+      {
+        ctrl.refreshIsActive =  true;
+      }
+    }
+
   // When the user clicks on ui-select, displays the dropdown list
   ctrl.activate = function(initSearchValue, avoidReset) {
     if (!ctrl.disabled  && !ctrl.open) {
@@ -119,7 +129,8 @@ uis.controller('uiSelectCtrl',
       ctrl.open = true;
 
       ctrl.activeIndex = ctrl.activeIndex >= ctrl.items.length ? 0 : ctrl.activeIndex;
-
+      
+      _setrefreshIsActive();
       // 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 ) {

test/select.spec.js

@@ -168,6 +168,8 @@ describe('ui-select tests', function() {
       if (attrs.refresh !== undefined) { choicesAttrsHtml += ' refresh="' + attrs.refresh + '"'; }
       if (attrs.refreshDelay !== undefined) { choicesAttrsHtml += ' refresh-delay="' + attrs.refreshDelay + '"'; }
       if (attrs.backspaceReset !== undefined) { attrsHtml += ' backspace-reset="' + attrs.backspaceReset + '"';}
+      if (attrs.refreshOnActive !== undefined) { choicesAttrsHtml += ' refresh-on-active="' + attrs.refreshOnActive + '"'; }
+      
     }
 
     return compileTemplate(
@@ -3119,5 +3121,17 @@ describe('ui-select tests', function() {
       expect(el.scope().$select.spinnerClass).toBe('randomclass');
     });
   });
-
+  
+  describe('With refresh on active', function(){
+    it('should not refresh untill is activated', function(){
+       scope.fetchFromServer = function(){};
+       var el = createUiSelect({refresh:"fetchFromServer($select.search)",refreshOnActive:true,refreshDelay:0});
+       spyOn(scope, 'fetchFromServer');
+       $timeout.flush();
+       expect(scope.fetchFromServer.calls.any()).toEqual(false); 
+       el.scope().$select.activate();
+       $timeout.flush();
+       expect(scope.fetchFromServer.calls.any()).toEqual(true);
+     });
+   });
 });