Merge pull request #901 from loverajoel/joel_stop_propagation_enter_esc

Stop propagation when pressing ENTER or ESC key from dropdown

Author: Brian Feister

src/uiSelectController.js

@@ -437,6 +437,11 @@ uis.controller('uiSelectCtrl',
       _ensureHighlightVisible();
     }
 
+    if (key === KEY.ENTER || key === KEY.ESC) {
+      e.preventDefault();
+      e.stopPropagation();
+    }
+
   });
 
   // If tagging try to split by tokens and add items

test/select.spec.js

@@ -1510,6 +1510,34 @@ describe('ui-select tests', function() {
 
     });
 
+    it('should stop the propagation when pressing ENTER key from dropdown', function() {
+
+        var el = createUiSelectMultiple();
+        var searchInput = el.find('.ui-select-search');
+        spyOn(jQuery.Event.prototype, 'preventDefault');
+        spyOn(jQuery.Event.prototype, 'stopPropagation');
+
+        triggerKeydown(searchInput, Key.Down)
+        triggerKeydown(searchInput, Key.Enter)
+        expect(jQuery.Event.prototype.preventDefault).toHaveBeenCalled();
+        expect(jQuery.Event.prototype.stopPropagation).toHaveBeenCalled();
+
+    });
+
+    it('should stop the propagation when pressing ESC key from dropdown', function() {
+
+        var el = createUiSelectMultiple();
+        var searchInput = el.find('.ui-select-search');
+        spyOn(jQuery.Event.prototype, 'preventDefault');
+        spyOn(jQuery.Event.prototype, 'stopPropagation');
+
+        triggerKeydown(searchInput, Key.Down)
+        triggerKeydown(searchInput, Key.Escape)
+        expect(jQuery.Event.prototype.preventDefault).toHaveBeenCalled();
+        expect(jQuery.Event.prototype.stopPropagation).toHaveBeenCalled();
+
+    });
+
     it('should increase $select.activeIndex when pressing DOWN key from dropdown', function() {
 
         var el = createUiSelectMultiple();