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

Fix script attribute handling so type trumps language (135493, r=heikki, sr=jst).

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@120893 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brendan%mozilla.org
2002-05-06 22:59:42 +00:00
parent bab803e830
commit 843653e566
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/content/base/src/nsScriptLoader.cpp
View File

@@ -275,7 +275,13 @@ nsScriptLoader::ProcessScriptElement(nsIDOMHTMLScriptElement *aElement,
PRBool isJavaScript = PR_TRUE;
const char* jsVersionString = nsnull;
nsAutoString src, type, language;
nsAutoString language, type, src;
// Check the language attribute first, so type can trump language.
aElement->GetAttribute(NS_LITERAL_STRING("language"), language);
if (!language.IsEmpty()) {
isJavaScript = nsParserUtils::IsJavaScriptLanguage(language, &jsVersionString);
}
// Check the type attribute to determine language and version.
aElement->GetType(type);
@@ -305,12 +311,6 @@ nsScriptLoader::ProcessScriptElement(nsIDOMHTMLScriptElement *aElement,
}
}
// Check the language attribute.
aElement->GetAttribute(NS_LITERAL_STRING("language"), language);
if (!language.IsEmpty()) {
isJavaScript = nsParserUtils::IsJavaScriptLanguage(language, &jsVersionString);
}
// If this isn't JavaScript, we don't know how to evaluate.
// XXX How and where should we deal with other scripting languages??
if (!isJavaScript) {