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 1147946, part 2 - Move body of check inside prior if in XULContentSinkImpl::OpenScript(). r=baku

Browse Source
This commit is contained in:
Andrew McCreight 2015-04-02 12:13:15 -07:00
parent f2444c8eab
commit d574337098
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/xul/nsXULContentSink.cpp
View File

@ -887,12 +887,8 @@ XULContentSinkImpl::OpenScript(const char16_t** aAttributes,
if (nsContentUtils::IsJavascriptMIMEType(mimeType)) {
langID = nsIProgrammingLanguage::JAVASCRIPT;
version = JSVERSION_LATEST;
} else {
langID = nsIProgrammingLanguage::UNKNOWN;
}
if (langID != nsIProgrammingLanguage::UNKNOWN) {
// Get the version string, and ensure the language supports it.
// Get the version string, and ensure that JavaScript supports it.
nsAutoString versionName;
rv = parser.GetParameter("version", versionName);
@ -901,6 +897,8 @@ XULContentSinkImpl::OpenScript(const char16_t** aAttributes,
} else if (rv != NS_ERROR_INVALID_ARG) {
return rv;
}
} else {
langID = nsIProgrammingLanguage::UNKNOWN;
}
} else if (key.EqualsLiteral("language")) {
// Language is deprecated, and the impl in nsScriptLoader ignores the