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

Add JS1.6 support, moving E4X and Array extras there (306664, r/sr=mrbkap/shaver, a=me).

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@179703 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brendan%mozilla.org
2005-09-06 17:45:29 +00:00
parent a98db46cfc
commit c1939bd3b8
6 changed files with 81 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -473,6 +473,7 @@ nsScriptLoader::ProcessScriptElement(nsIScriptElement *aElement,
case '3': jsVersion = JSVERSION_1_3; break;
case '4': jsVersion = JSVERSION_1_4; break;
case '5': jsVersion = JSVERSION_1_5; break;
case '6': jsVersion = JSVERSION_1_6; break;
default: jsVersion = JSVERSION_UNKNOWN;
}
}
@@ -739,9 +740,12 @@ nsScriptLoader::EvaluateScript(nsScriptLoadRequest* aRequest,
JSContext *cx = (JSContext *)context->GetNativeContext();
uint32 options = ::JS_GetOptions(cx);
PRBool needE4X = aRequest->mHasE4XOption && !(options & JSOPTION_XML);
if (needE4X) {
::JS_SetOptions(cx, options | JSOPTION_XML);
JSBool changed = (aRequest->mHasE4XOption ^ !!(options & JSOPTION_XML));
if (changed) {
::JS_SetOptions(cx,
aRequest->mHasE4XOption
? options | JSOPTION_XML
: options & ~JSOPTION_XML);
}
// Update our current script.
@@ -757,7 +761,7 @@ nsScriptLoader::EvaluateScript(nsScriptLoadRequest* aRequest,
mCurrentScript = oldCurrent;
::JS_ReportPendingException(cx);
if (needE4X) {
if (changed) {
::JS_SetOptions(cx, options);
}