aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAeron Glemann <aglemann@backcountry.com>2012-08-10 16:59:06 -0600
committerAeron Glemann <aglemann@backcountry.com>2012-08-10 16:59:06 -0600
commit4881ac41f19dff481fff4c563a21f8d38b4c53db (patch)
tree6b20638045f5795857bffd9e15dccdc5b10bf60c
parent3a751b70826e3388e14595204492a3a4c1c89b05 (diff)
downloadjquery-ui-4881ac41f19dff481fff4c563a21f8d38b4c53db.tar.gz
jquery-ui-4881ac41f19dff481fff4c563a21f8d38b4c53db.zip
Fixed formatting
-rw-r--r--tests/unit/selectmenu/selectmenu_tickets.js1
-rw-r--r--ui/jquery.ui.selectmenu.js4
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/unit/selectmenu/selectmenu_tickets.js b/tests/unit/selectmenu/selectmenu_tickets.js
index 8bf644ea8..bddcf69de 100644
--- a/tests/unit/selectmenu/selectmenu_tickets.js
+++ b/tests/unit/selectmenu/selectmenu_tickets.js
@@ -19,6 +19,7 @@ test('#241 - "focus" doesn\'t bubble', function() {
ok($('.ui-selectmenu-menu li:eq(1)').hasClass('ui-selectmenu-item-focus'), 'after down arrow press, second item should have focus');
// simulate('keypress') not working consistently in all browsers
+ // this problem but for firefox now: http://bugs.jqueryui.com/ticket/3229
var e = new $.Event('keypress', { which: 'a'.charCodeAt(0) });
$('.ui-selectmenu-menu-dropdown').trigger(e);
ok($('.ui-selectmenu-menu li:eq(2)').hasClass('ui-selectmenu-item-focus'), 'after "a" key press, third item should have focus');
diff --git a/ui/jquery.ui.selectmenu.js b/ui/jquery.ui.selectmenu.js
index 809dd2118..d16186345 100644
--- a/ui/jquery.ui.selectmenu.js
+++ b/ui/jquery.ui.selectmenu.js
@@ -317,7 +317,7 @@ $.widget("ui.selectmenu", {
thisAAttr[ 'typeahead' ] = selectOptionData[ i ].typeahead;
}
var thisA = $('<a/>', thisAAttr)
- .bind('focus.selectmenu', function(e) {
+ .bind('focus.selectmenu', function() {
$(this).parent().mouseover();
})
.bind('blur.selectmenu', function() {
@@ -343,7 +343,7 @@ $.widget("ui.selectmenu", {
.bind("click.selectmenu", function() {
return false;
})
- .bind('mouseover.selectmenu', function(e) {
+ .bind('mouseover.selectmenu', function() {
// no hover if diabled
if (!$(this).hasClass(self.namespace + '-state-disabled') && !$(this).parent("ul").parent("li").hasClass(self.namespace + '-state-disabled')) {
self._selectedOptionLi().addClass(activeClass);