Index: trunk/LayoutTests/fast/forms/listbox-onchange.html |
=================================================================== |
--- trunk/LayoutTests/fast/forms/listbox-onchange.html (revision 197019) |
+++ trunk/LayoutTests/fast/forms/listbox-onchange.html (working copy) |
@@ -122,46 +122,34 @@ |
function mouseDownOnSelect(selId, index, shift, metaOrCtrl) |
{ |
- modifiers = []; |
- if (shift) |
- modifiers[0] = "shiftKey"; |
+ var meta = false; |
+ var ctrl = false; |
if (metaOrCtrl) { |
if (navigator.userAgent.search(/\bMac OS X\b/) != -1) |
- modifiers[modifiers.length] = "metaKey"; |
+ meta = true; |
else |
- modifiers[modifiers.length] = "ctrlKey"; |
+ ctrl = true; |
} |
- |
var sl = document.getElementById(selId); |
- var rect = sl.options[index].getBoundingClientRect(); |
- if (window.eventSender) { |
- eventSender.mouseMoveTo(rect.left + 1, rect.top + 1); |
- eventSender.mouseDown(0, modifiers); |
- } else { |
- debug("FAIL: This test requires window.eventSender."); |
- } |
+ var event = document.createEvent("MouseEvent"); |
+ event.initMouseEvent("mousedown", true, true, document.defaultView, 1, 0, 0, 0, 0, ctrl, false, shift, meta, 0, document); |
+ sl.options[index].dispatchEvent(event); |
} |
function mouseUpOnSelect(selId, index, shift, metaOrCtrl) |
{ |
- modifiers = []; |
- if (shift) |
- modifiers[0] = "shiftKey"; |
+ var meta = false; |
+ var ctrl = false; |
if (metaOrCtrl) { |
if (navigator.userAgent.search(/\bMac OS X\b/) != -1) |
- modifiers[modifiers.length] = "metaKey"; |
+ meta = true; |
else |
- modifiers[modifiers.length] = "ctrlKey"; |
+ ctrl = true; |
} |
- |
var sl = document.getElementById(selId); |
- var rect = sl.options[index].getBoundingClientRect(); |
- if (window.eventSender) { |
- eventSender.mouseMoveTo(rect.left + 1, rect.top + 1); |
- eventSender.mouseUp(0, modifiers); |
- } else { |
- debug("FAIL: This test requires window.eventSender."); |
- } |
+ var event = document.createEvent("MouseEvent"); |
+ event.initMouseEvent("mouseup", true, true, document.defaultView, 1, 0, 0, 0, 0, ctrl, false, shift, meta, 0, document); |
+ sl.options[index].dispatchEvent(event); |
} |
function keyDownOnSelect(selId, identifier, shift, metaOrCtrl) |
@@ -173,7 +161,7 @@ |
if (navigator.userAgent.search(/\bMac OS X\b/) != -1) |
modifiers[modifiers.length] = "metaKey"; |
else |
- modifiers[modifiers.length] = "ctrlKey"; |
+ modifiers[modifiers.length] = "controlKey"; |
} |
document.getElementById(selId).focus(); |