Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 749367 - script type=texttemplate content parsed as JavaScript (+E4X), r=jst, f=ms2ger, mbrubeck, jdm

Browse Source
This commit is contained in:
Mark Capella 2012-05-09 07:24:24 -07:00
parent 67b4fa97a8
commit dd4dbf0fab
6 changed files with 73 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -465,18 +465,8 @@ nsScriptLoader::ProcessScriptElement(nsIScriptElement *aElement)
}
}
if (isJavaScript)
typeID = nsIProgrammingLanguage::JAVASCRIPT;
else {
// Use the object factory to locate a matching language.
nsCOMPtr<nsIScriptRuntime> runtime;
rv = NS_GetJSRuntime(getter_AddRefs(runtime));
if (NS_FAILED(rv) || runtime == nsnull) {
// Failed to get the explicitly specified language
NS_WARNING("Failed to find a scripting language");
if (!isJavaScript) {
typeID = nsIProgrammingLanguage::UNKNOWN;
} else
typeID = nsIProgrammingLanguage::JAVASCRIPT;
}
if (typeID != nsIProgrammingLanguage::UNKNOWN) {

1
content/base/test/Makefile.in
View File

@ -578,6 +578,7 @@ _TEST_FILES2 = \
test_bug719533.html \
test_bug737087.html \
test_bug433662.html \
test_bug749367.html \
$(NULL)
_CHROME_FILES = \

29
content/base/test/test_bug749367.html Normal file
View File

@ -0,0 +1,29 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=749367
-->
<head>
<title>Test for Bug 749367</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=749367">Mozilla Bug 749367</a>
<div id="content" style="display: none"></div>
<pre id="test">
<script type="text/template">
ok(false, "Shouldn't execute");
</script>
<script type="text/javascript">
ok(true, "Should execute");
</script>
</pre>
</body>
</html>

1
content/xul/content/test/Makefile.in
View File

@ -46,6 +46,7 @@ include $(topsrcdir)/config/rules.mk
_TEST_FILES = \
test_bug486990.xul \
test_bug749367.xul \
$(NULL)
_CHROME_FILES = \

39
content/xul/content/test/test_bug749367.xul Normal file
View File

@ -0,0 +1,39 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
<?xml-stylesheet type="text/css" href="/tests/SimpleTest/test.css"?>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=749367
-->
<window title="Mozilla Bug 749367"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="setTimeout(runTests, 0);">
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"/>
<!-- test results are displayed in the html:body -->
<body xmlns="http://www.w3.org/1999/xhtml">
<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=486990"
target="_blank">Mozilla Bug 486990</a>
</body>
<!-- test code goes here -->
<script type="text/template">
<![CDATA[
SimpleTest.waitForExplicitFinish();
function runTests() {
ok(false, "Shouldn't execute");
SimpleTest.finish();
}
]]>
</script>
<script type="text/javascript">
<![CDATA[
SimpleTest.waitForExplicitFinish();
function runTests() {
ok(true, "Should execute");
SimpleTest.finish();
}
]]>
</script>
</window>

8
content/xul/document/src/nsXULContentSink.cpp
View File

@ -928,15 +928,7 @@ XULContentSinkImpl::OpenScript(const PRUnichar** aAttributes,
langID = nsIProgrammingLanguage::JAVASCRIPT;
version = JSVERSION_LATEST;
} else {
// Use the script object factory to locate the language.
nsCOMPtr<nsIScriptRuntime> runtime;
rv = NS_GetJSRuntime(getter_AddRefs(runtime));
if (NS_FAILED(rv) || runtime == nsnull) {
// Failed to get the explicitly specified language
NS_WARNING("Failed to find a scripting language");
langID = nsIProgrammingLanguage::UNKNOWN;
} else
langID = nsIProgrammingLanguage::JAVASCRIPT;
}
if (langID != nsIProgrammingLanguage::UNKNOWN) {