Merge pull request #1211 from angular-ui/feat-choices-hover-css

refactor(choices): avoid setting activeItem on mouseenter

Author: dimirc

src/common.css

@@ -17,6 +17,11 @@
   top: 0px !important;
 }
 
+
+.ui-select-choices-row:hover {
+  background-color: #f5f5f5;
+}
+
 /* Select2 theme */
 
 /* Mark invalid Select2 */

src/uiSelectChoicesDirective.js

@@ -41,7 +41,6 @@ uis.directive('uiSelectChoices',
 
         choices.attr('ng-repeat', $select.parserResult.repeatExpression(groupByExp))
             .attr('ng-if', '$select.open') //Prevent unnecessary watches when dropdown is closed
-            .attr('ng-mouseenter', '$select.setActiveItem('+$select.parserResult.itemName +')')
             .attr('ng-click', '$select.select(' + $select.parserResult.itemName + ',false,$event)');
 
         var rowsInner = element.querySelectorAll('.ui-select-choices-row-inner');

src/uiSelectController.js

@@ -224,10 +224,6 @@ uis.controller('uiSelectCtrl',
     }
   };
 
-  ctrl.setActiveItem = function(item) {
-    ctrl.activeIndex = ctrl.items.indexOf(item);
-  };
-
   ctrl.isActive = function(itemScope) {
     if ( !ctrl.open ) {
       return false;

test/select.spec.js

@@ -1135,35 +1135,6 @@ describe('ui-select tests', function() {
 
   });
 
-  it('should invoke hover callback', function(){
-
-    var highlighted;
-    scope.onHighlightFn = function ($item) {
-      highlighted = $item;
-    };
-
-    var el = compileTemplate(
-      '<ui-select on-select="onSelectFn($item, $model)" ng-model="selection.selected"> \
-        <ui-select-match placeholder="Pick one...">{{$select.selected.name}}</ui-select-match> \
-        <ui-select-choices on-highlight="onHighlightFn(person)" repeat="person.name as person in people | filter: $select.search"> \
-          <div ng-bind-html="person.name | highlight: $select.search"></div> \
-          <div ng-bind-html="person.email | highlight: $select.search"></div> \
-        </ui-select-choices> \
-      </ui-select>'
-    );
-
-    expect(highlighted).toBeFalsy();
-
-    if (!isDropdownOpened(el)){
-      openDropdown(el);
-    }
-
-    $(el).find('.ui-select-choices-row div:contains("Samantha")').trigger('mouseover');
-    scope.$digest();
-
-    expect(highlighted).toBe(scope.people[5]);
-  });
-
   it('should set $item & $model correctly when invoking callback on select and no single prop. binding', function () {
 
     scope.onSelectFn = function ($item, $model, $label) {