From 2a777b6656c75d092bd52d583aecec8a3caba41e Mon Sep 17 00:00:00 2001 From: "joki%netscape.com" Date: Thu, 12 Nov 1998 21:35:27 +0000 Subject: [PATCH] Fix bug where the DOM event bubbling process was overriding previous event status codes. git-svn-id: svn://10.0.0.236/trunk@14529 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/content/src/nsGenericDOMDataNode.cpp | 1 + mozilla/layout/html/content/src/nsGenericElement.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mozilla/layout/html/content/src/nsGenericDOMDataNode.cpp b/mozilla/layout/html/content/src/nsGenericDOMDataNode.cpp index e6b3d1bc9cd..4c591120160 100644 --- a/mozilla/layout/html/content/src/nsGenericDOMDataNode.cpp +++ b/mozilla/layout/html/content/src/nsGenericDOMDataNode.cpp @@ -589,6 +589,7 @@ nsGenericDOMDataNode::HandleDOMEvent(nsIPresContext& aPresContext, nsIDOMEvent* domEvent = nsnull; if (DOM_EVENT_INIT == aFlags) { + aEventStatus = nsEventStatus_eIgnore; nsIEventStateManager *manager; if (NS_OK == aPresContext.GetEventStateManager(&manager)) { manager->SetEventTarget(mContent); diff --git a/mozilla/layout/html/content/src/nsGenericElement.cpp b/mozilla/layout/html/content/src/nsGenericElement.cpp index 648ebb2e813..7e57da630eb 100644 --- a/mozilla/layout/html/content/src/nsGenericElement.cpp +++ b/mozilla/layout/html/content/src/nsGenericElement.cpp @@ -947,11 +947,11 @@ nsGenericElement::HandleDOMEvent(nsIPresContext& aPresContext, PRUint32 aFlags, nsEventStatus& aEventStatus) { - aEventStatus = nsEventStatus_eIgnore; nsresult ret = NS_OK; nsIDOMEvent* domEvent = nsnull; if (DOM_EVENT_INIT == aFlags) { + aEventStatus = nsEventStatus_eIgnore; nsIEventStateManager *manager; if (NS_OK == aPresContext.GetEventStateManager(&manager)) { manager->SetEventTarget(mContent);