aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-02-29 22:09:13 -0500
committerScott González <scott.gonzalez@gmail.com>2012-02-29 22:09:13 -0500
commit8c10c1e41b07ebadf8b3cf67fac88d27ee6c9fdb (patch)
treedc02c3aeb8c30697b32af0313dfa59f8aaa0dd67
parent72c17f061430c0c7ff94f39e0d70ef07f7b7237b (diff)
downloadjquery-ui-8c10c1e41b07ebadf8b3cf67fac88d27ee6c9fdb.tar.gz
jquery-ui-8c10c1e41b07ebadf8b3cf67fac88d27ee6c9fdb.zip
Revert "Selectmenu: added a temp fix for Safari to make unit test work, see https://github.com/jquery/jquery-ui/pull/492#issuecomment-4214604"
This reverts commit 72c17f061430c0c7ff94f39e0d70ef07f7b7237b.
-rw-r--r--tests/unit/selectmenu/selectmenu_core.js4
-rw-r--r--tests/unit/selectmenu/selectmenu_events.js12
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/unit/selectmenu/selectmenu_core.js b/tests/unit/selectmenu/selectmenu_core.js
index 85678e89f..53872a980 100644
--- a/tests/unit/selectmenu/selectmenu_core.js
+++ b/tests/unit/selectmenu/selectmenu_core.js
@@ -60,8 +60,8 @@ $.each([
equals( element.find("option:selected").val(), selected.next("option").val() , "after keydown original select state" );
equals( button.text(), selected.next("option").text(), "after keydown button text" );
- button.simulate( "click", { clientX: 1, clientY: 1 } );
- menu.find("a").last().simulate( "mouseover", { clientX: 1, clientY: 1 } ).trigger( "click" );
+ button.simulate( "click" );
+ menu.find("a").last().simulate( "mouseover" ).trigger( "click" );
equals( menu.attr("aria-activedescendant"), links.eq(element[0].selectedIndex).attr("id"), "after click menu aria-activedescendant" );
equals( links.eq(element[0].selectedIndex).attr("aria-selected"), "true", "after click selected menu link aria-selected" );
equals( element.find("option:selected").val(), element.find("option").last().val(), "after click original select state" );
diff --git a/tests/unit/selectmenu/selectmenu_events.js b/tests/unit/selectmenu/selectmenu_events.js
index 805beaf93..9e8629f5b 100644
--- a/tests/unit/selectmenu/selectmenu_events.js
+++ b/tests/unit/selectmenu/selectmenu_events.js
@@ -23,8 +23,8 @@ test("change", function () {
menu = this.element.selectmenu("menuWidget").parent(),
value = this.element.find("option").first().text();
- button.find("a").simulate( "focus" ).simulate( "click", { clientX: 1, clientY: 1 } );
- menu.find("a").first().simulate( "mouseover", { clientX: 1, clientY: 1 } ).trigger( "click" );
+ button.find("a").simulate( "focus" ).simulate( "click" );
+ menu.find("a").first().simulate( "mouseover" ).trigger( "click" );
});
@@ -63,8 +63,8 @@ test("focus", function () {
var button = this.element.selectmenu("widget").parent(),
menu = this.element.selectmenu("menuWidget").parent();
- button.find("a").simulate( "focus" ).simulate( "click", { clientX: 1, clientY: 1 } );
- menu.find(".ui-menu-item").simulate("mouseover", { clientX: 1, clientY: 1 });
+ button.find("a").simulate( "focus" ).simulate( "click" );
+ menu.find(".ui-menu-item").simulate("mouseover");
});
@@ -98,8 +98,8 @@ test("select", function () {
var button = this.element.selectmenu("widget").parent(),
menu = this.element.selectmenu("menuWidget").parent();
- button.find("a").simulate( "focus" ).simulate( "click", { clientX: 1, clientY: 1 } );
- menu.find("a").first().simulate( "mouseover", { clientX: 1, clientY: 1 } ).trigger("click");
+ button.find("a").simulate( "focus" ).simulate( "click" );
+ menu.find("a").first().simulate( "mouseover" ).trigger("click");
});
})(jQuery);