wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 615186, clear mouse selection and capturing state when opening a modal dialog, r=smaug,a=blocking

Browse Source
This commit is contained in:
Neil Deakin 2011-01-12 21:00:14 -05:00
parent deb3710bed
commit b33e662da2
2 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/base/nsGlobalWindow.cpp
View File

@ -6277,6 +6277,13 @@ nsGlobalWindow::EnterModalState()
nsContentUtils::ContentIsCrossDocDescendantOf(activeShell->GetDocument(), mDoc) ||
nsContentUtils::ContentIsCrossDocDescendantOf(mDoc, activeShell->GetDocument()))) {
nsEventStateManager::ClearGlobalActiveContent(activeESM);
activeShell->SetCapturingContent(nsnull, 0);
if (activeShell) {
nsCOMPtr<nsFrameSelection> frameSelection = activeShell->FrameSelection();
frameSelection->SetMouseDownState(PR_FALSE);
}
}
}

51
toolkit/components/prompts/test/test_bug620145.html
View File

@ -12,14 +12,25 @@
<pre id="test">
</pre>
<button id="button" onmouseup="onButton()">Button</button>
<div id="text" style="max-width: 100px" onmouseup="openAlert()">
This is a short piece of text used for testing that mouse selecting is
stopped when an alert appears.
</div>
<div id="text2" style="max-width: 100px">
This is another short piece of text used for testing that mouse selecting is
stopped when an alert appears.
</div>
<button id="button" onmouseup="openAlert()">Button</button>
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
var selectionTest = false;
var testNum = 0;
var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
getInterface(Components.interfaces.nsIDOMWindowUtils);
function onButton() {
function openAlert() {
ok(true, "opening alert...");
alert("hello!");
ok(true, "...alert done.");
@ -34,26 +45,38 @@ function runtest()
isTabModal = true;
startCallbackTimer();
var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
getInterface(Components.interfaces.nsIDOMWindowUtils);
var button = $("button");
dispatchMouseEvent(button, "mousedown");
dispatchMouseEvent(button, "mouseup");
var e = document.createEvent("MouseEvent");
e.initEvent("mousedown", false, false, window, 0, 1, 1, 1, 1,
false, false, false, false, 0, null);
utils.dispatchDOMEventViaPresShell($("button"), e, true);
ok(true, "mousedown sent");
selectionTest = true;
e = document.createEvent("MouseEvent");
e.initEvent("mouseup", false, false, window, 0, 1, 1, 1, 1,
false, false, false, false, 0, null);
utils.dispatchDOMEventViaPresShell($("button"), e, true);
startCallbackTimer();
var text = $("text");
dispatchMouseEvent(text, "mousedown");
dispatchMouseEvent(text, "mouseup");
ok(true, "mouseup sent");
SimpleTest.finish();
}
function dispatchMouseEvent(target, type)
{
e = document.createEvent("MouseEvent");
e.initEvent(type, false, false, window, 0, 1, 1, 1, 1,
false, false, false, false, 0, null);
utils.dispatchDOMEventViaPresShell(target, e, true);
ok(true, type + " sent to " + target.id);
}
function handleDialog(ui, testNum)
{
if (selectionTest) {
synthesizeMouse($("text"), 25, 55, { type: "mousemove" });
is(window.getSelection().toString(), "", "selection not made");
synthesizeMouse(ui.button0, 5, 5, { }, ui.button0.ownerDocument.defaultView);
}
ok(true, "handleDialog sending mouseclick to dialog...");
synthesizeMouse(ui.button0, 5, 5, { }, ui.button0.ownerDocument.defaultView);
}