mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

back out bug 238987

This commit is contained in:
Olli.Pettay@helsinki.fi 2007-07-03 05:37:00 -07:00
Родитель cad259320f
Коммит 09de4e615b
5 изменённых файлов: 6 добавлений и 157 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
content/events/src/nsEventStateManager.cpp
Просмотреть файл

@ -774,7 +774,6 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
nsEventStatus blurstatus = nsEventStatus_eIgnore;
nsEvent blurevent(PR_TRUE, NS_BLUR_CONTENT);
blurevent.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
nsEventDispatcher::Dispatch(gLastFocusedDocument,
gLastFocusedPresContext,
@ -838,9 +837,10 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
nsEventStatus status = nsEventStatus_eIgnore;
nsEvent focusevent(PR_TRUE, NS_FOCUS_CONTENT);
focusevent.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
if (gLastFocusedDocument != mDocument) {
//XXXsmaug bubbling for now, because in the old event dispatching
// code focus event did bubble from document to window.
nsEventDispatcher::Dispatch(mDocument, aPresContext,
&focusevent, nsnull, &status);
if (currentFocus && currentFocus != gLastFocusedContent) {
@ -921,7 +921,6 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
nsEventStatus status = nsEventStatus_eIgnore;
nsEvent event(PR_TRUE, NS_BLUR_CONTENT);
event.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
if (gLastFocusedDocument && gLastFocusedPresContext) {
if (gLastFocusedContent) {
@ -1085,7 +1084,6 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
nsEventStatus status = nsEventStatus_eIgnore;
nsEvent event(PR_TRUE, NS_BLUR_CONTENT);
event.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
if (gLastFocusedContent) {
nsIPresShell *shell = gLastFocusedDocument->GetPrimaryShell();
@ -4183,7 +4181,6 @@ nsEventStateManager::SendFocusBlur(nsPresContext* aPresContext,
//fire blur
nsEventStatus status = nsEventStatus_eIgnore;
nsEvent event(PR_TRUE, NS_BLUR_CONTENT);
event.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
EnsureDocument(presShell);
@ -4247,7 +4244,6 @@ nsEventStateManager::SendFocusBlur(nsPresContext* aPresContext,
window) {
nsEventStatus status = nsEventStatus_eIgnore;
nsEvent event(PR_TRUE, NS_BLUR_CONTENT);
event.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
// Make sure we're not switching command dispatchers, if so,
// suppress the blurred one if it isn't already suppressed
@ -4357,7 +4353,6 @@ nsEventStateManager::SendFocusBlur(nsPresContext* aPresContext,
//fire focus
nsEventStatus status = nsEventStatus_eIgnore;
nsEvent event(PR_TRUE, NS_FOCUS_CONTENT);
event.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
if (nsnull != mPresContext) {
nsCxPusher pusher(aContent);
@ -4382,7 +4377,6 @@ nsEventStateManager::SendFocusBlur(nsPresContext* aPresContext,
//see bugzilla bug 93521
nsEventStatus status = nsEventStatus_eIgnore;
nsEvent event(PR_TRUE, NS_FOCUS_CONTENT);
event.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
if (nsnull != mPresContext && mDocument) {
nsCxPusher pusher(mDocument);

1
content/events/test/Makefile.in
Просмотреть файл

@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_TEST_FILES = \
test_bug238987.html \
test_bug336682_1.html \
test_bug336682_2.xul \
test_bug336682.js \

147
content/events/test/test_bug238987.html
Просмотреть файл

@ -1,147 +0,0 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=238987
-->
<head>
<title>Test for Bug 238987</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=238987">Mozilla Bug 238987</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
/** Test for Bug 238987 **/
var shouldStop = false;
var modifier = 0;
var expectedResult = "i1,i2,i3,i4,i5,i6,i7,i8,i9,i10,i11,i12";
var forwardArray = expectedResult.split(",");
var backwardArray = expectedResult.split(",");
// Adding 3 for "begin", "end", "begin" and one for the <a> in the Mochitest template.
var expectedWindowFocusCount = forwardArray.length + backwardArray.length + 4;
function handleFocus(e) {
if (e.target.id == "begin") {
// if modifier is set, the test is coming back from the end.
if (modifier) {
shouldStop = true;
}
} else if (e.target.id == "end") {
modifier = Components.interfaces.nsIDOMNSEvent.SHIFT_MASK;
} else if (modifier) {
var expected = backwardArray.pop();
ok(expected == e.target.id,
"Backward tabbing, expected [" + expected + "], got [" + e.target.id + "]");
} else {
var expected = forwardArray.shift();
ok(expected == e.target.id,
"Forward tabbing, expected [" + expected + "], got [" + e.target.id + "]");
}
}
function handleWindowFocus(e) {
--expectedWindowFocusCount;
var s = "target " + e.target;
if ("id" in e.target) {
s = s + ", id=\"" + e.target.id + "\"";
}
ok(e.eventPhase == Components.interfaces.nsIDOMEvent.CAPTURING_PHASE,
"|window| should not have got focus, " + s + "\n");
}
function start() {
window.focus();
window.addEventListener("focus", handleWindowFocus, true);
window.addEventListener("focus", handleWindowFocus, false);
var elements = document.getElementsByTagName("*");
for (var i = 0; i < elements.length; ++i) {
if (elements[i].hasAttribute("id")) {
elements[i].addEventListener("focus", handleFocus, false);
}
}
tab();
}
function tab() {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
getInterface(Components.interfaces.nsIDOMWindowUtils);
// Send tab key events.
var key = Components.interfaces.nsIDOMKeyEvent.DOM_VK_TAB;
utils.sendKeyEvent("keydown", key, 0, modifier);
utils.sendKeyEvent("keypress", key, 0, modifier);
utils.sendKeyEvent("keyup", key, 0, modifier);
if (shouldStop) {
ok(forwardArray.length == 0,
"Not all forward tabbing tests were run, " + forwardArray.toString());
ok(backwardArray.length == 0,
"Not all forward tabbing tests were run, " + backwardArray.toString());
ok(expectedWindowFocusCount == 0,
"|window| didn't get right amount focus events")
SimpleTest.finish();
} else {
setTimeout(tab, 50);
}
}
function doTest() {
setTimeout(start, 100);
}
SimpleTest.waitForExplicitFinish();
addLoadEvent(doTest);
</script>
</pre>
<h4 tabindex="0" id="begin">Test:</h4>
<table>
<tbody>
<tr>
<td>type="text"</td><td><input type="text" id="i1" value=""></td>
</tr>
<tr>
<td>type="button"</td><td><input type="button" id="i2" value="type='button'"></td>
</tr>
<tr>
<td>type="checkbox"</td><td><input type="checkbox" id="i3" ></td>
</tr>
<tr>
<td>type="radio" checked</td><td><input type="radio" id="i4" name="radio" checked>
<input type="radio" id="i4b" name="radio"></td>
</tr>
<tr>
<td>type="radio"</td><td><input type="radio" id="i5" name="radio2">
<input type="radio" id="i6" name="radio2"></td>
</tr>
<tr>
<td>type="password"</td><td><input type="password" id="i7"></td>
</tr>
<tr>
<td>type="file"</td><td><input type="file" id="i8"></td>
</tr>
<tr>
<td>button</td><td><button id="i9">button</button></td>
</tr>
<tr>
<td>select</td><td><select id="i10"><option>select</option></select></td>
</tr>
<tr>
<td>a</td><td><a href="#radio" id="i11">a link</a></td>
</tr>
<tr>
<td>tabindex="0"</td><td><span tabindex="0" id="i12">span</span></td>
</tr>
</tbody>
</table>
<h4 tabindex="0" id="end">done.</h4>
</body>
</html>

1
content/html/content/src/nsHTMLLabelElement.cpp
Просмотреть файл

@ -254,7 +254,6 @@ nsHTMLLabelElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
// of redirecting |SetFocus|.
{
nsEvent event(NS_IS_TRUSTED_EVENT(aVisitor.mEvent), NS_FOCUS_CONTENT);
event.flags |= NS_EVENT_FLAG_CANT_BUBBLE;
nsEventStatus status = aVisitor.mEventStatus;
DispatchEvent(aVisitor.mPresContext, &event,
content, PR_TRUE, &status);

4
editor/libeditor/text/nsEditorEventListeners.cpp
Просмотреть файл

@ -1079,6 +1079,8 @@ nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent)
// turn on selection and caret
if (mEditor)
{
aEvent->StopPropagation();
PRUint32 flags;
mEditor->GetFlags(&flags);
if (! (flags & nsIPlaintextEditor::eEditorDisabledMask))
@ -1133,6 +1135,8 @@ nsTextEditorFocusListener::Blur(nsIDOMEvent* aEvent)
// turn off selection and caret
if (mEditor)
{
aEvent->StopPropagation();
// when imeEditor exists, call ForceCompositionEnd() to tell
// the input focus is leaving first
nsCOMPtr<nsIEditorIMESupport> imeEditor = do_QueryInterface(mEditor);