Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #174404 (r=adam, sr=jst) Support the optional FOR and EVENT attributes on the SCRIPT tag

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@133264 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
2002-11-07 05:17:21 +00:00
parent 8b87dad367
commit dad38a973d
19 changed files with 814 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/content/html/document/src/nsHTMLContentSink.cpp
View File

@@ -5624,16 +5624,27 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
return rv;
}
// Determine whether the script is really an event handler.
// Event handler scripts are NOT immediately evaluated.
nsCOMPtr<nsIDOMHTMLScriptElement> scriptElement = do_QueryInterface(element);
PRBool bIsEventHandler = PR_FALSE;
nsAutoString forString;
scriptElement->GetHtmlFor(forString);
if (!forString.IsEmpty()) {
bIsEventHandler = PR_TRUE;
}
nsCOMPtr<nsIDTD> dtd;
mParser->GetDTD(getter_AddRefs(dtd));
NS_ENSURE_TRUE(dtd, NS_ERROR_FAILURE);
nsCOMPtr<nsIScriptElement> sele(do_QueryInterface(element));
nsAutoString script;
PRInt32 lineNo = 0;
dtd->CollectSkippedContent(eHTMLTag_script, script, lineNo);
nsCOMPtr<nsIScriptElement> sele(do_QueryInterface(element));
if (sele) {
sele->SetLineNumber((PRUint32)lineNo);
}
@@ -5673,10 +5684,11 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
// Assume that we're going to block the parser with a script load.
// If it's an inline script, we'll be told otherwise in the call
// to our ScriptAvailable method.
mNeedToBlockParser = PR_TRUE;
//
// However, if this script is an event handler, then DO NOT block the
// parser because it will NOT be executed now.
mNeedToBlockParser = !bIsEventHandler;
nsCOMPtr<nsIDOMHTMLScriptElement> scriptElement =
do_QueryInterface(element);
mScriptElements->AppendElement(scriptElement);
}