mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1257246: Fix some failures in html tests. r=gijs 

We aren't intending to write to window.status here.

MozReview-Commit-ID: 7BRfgsO9NDr

--HG--
extra : rebase_source : 80bab7028668edd2f699b7ebe5b1ca1f6fb5e0a8
This commit is contained in:
Dave Townsend 2016-03-16 12:32:00 -07:00
Родитель d4c054c8ac
Коммит 60ecd69bb8
3 изменённых файлов: 81 добавлений и 81 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

84
browser/components/uitour/test/uitour.html
Просмотреть файл

@ -1,42 +1,42 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>UITour test</title>
<script type="application/javascript" src="UITour-lib.js">
</script>
<script type="application/javascript">
var callbackResult, callbackData;
function makeCallback(name) {
return (function(data) {
callbackResult = name;
callbackData = data;
});
}
// Defined in content to avoid weird issues when crossing between chrome/content.
function makeButtons() {
return [
{label: "Regular text", style: "text"},
{label: "Link", callback: makeCallback("link"), style: "link"},
{label: "Button 1", callback: makeCallback("button1")},
{label: "Button 2", callback: makeCallback("button2"), icon: "image.png",
style: "primary"}
];
}
function makeInfoOptions() {
return {
closeButtonCallback: makeCallback("closeButton"),
targetCallback: makeCallback("target"),
};
}
</script>
</head>
<body>
<h1>UITour tests</h1>
<p>Because Firefox is...</p>
<p>Never gonna let you down</p>
<p>Never gonna give you up</p>
</body>
</html>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>UITour test</title>
<script type="application/javascript" src="UITour-lib.js">
</script>
<script type="application/javascript">
var callbackResult, callbackData;
function makeCallback(name) {
return (function(data) {
callbackResult = name;
callbackData = data;
});
}
// Defined in content to avoid weird issues when crossing between chrome/content.
function makeButtons() {
return [
{label: "Regular text", style: "text"},
{label: "Link", callback: makeCallback("link"), style: "link"},
{label: "Button 1", callback: makeCallback("button1")},
{label: "Button 2", callback: makeCallback("button2"), icon: "image.png",
style: "primary"}
];
}
function makeInfoOptions() {
return {
closeButtonCallback: makeCallback("closeButton"),
targetCallback: makeCallback("target"),
};
}
</script>
</head>
<body>
<h1>UITour tests</h1>
<p>Because Firefox is...</p>
<p>Never gonna let you down</p>
<p>Never gonna give you up</p>
</body>
</html>

2
toolkit/content/plugins.html
Просмотреть файл

@ -141,7 +141,7 @@
state.setAttribute("label", "state");
state.appendChild(document.createTextNode(pluginsbundle.GetStringFromName("state_label") + " "));
stateDd.appendChild(state);
status = plugin.isActive ? pluginsbundle.GetStringFromName("state_enabled") : pluginsbundle.GetStringFromName("state_disabled");
var status = plugin.isActive ? pluginsbundle.GetStringFromName("state_enabled") : pluginsbundle.GetStringFromName("state_disabled");
if (plugin.blocklistState in stateNames) {
status += " (" + stateNames[plugin.blocklistState] + ")";
}

76
toolkit/xre/test/test_fpuhandler.html
Просмотреть файл

@ -1,38 +1,38 @@
<head>
<title>Floating-point exception handler test</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<body onload="runTest()">
<embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
<script class="testbody" type="application/javascript">
SimpleTest.waitForExplicitFinish();
function doDiv(x, y) {
var z;
z = x / y;
for (i = 0 + x; i < 1000; ++i)
z = y / x;
z = x / y;
return z;
}
function runTest()
{
ok(isNaN(doDiv(0.0, 0.0)), "Undefined division-by-zero doesn't crash");
try {
document.getElementById('plugin1').enableFPExceptions();
}
catch (e) {
ok(true, "No special code to set the FPU bit in the testplugin.");
SimpleTest.finish();
return;
}
ok(isNaN(doDiv(0.0, 0.0)), "Undefined division-by-zero doesn't crash again.");
SimpleTest.finish();
}
</script>
<head>
<title>Floating-point exception handler test</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<body onload="runTest()">
<embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
<script class="testbody" type="application/javascript">
SimpleTest.waitForExplicitFinish();
function doDiv(x, y) {
var z;
z = x / y;
for (i = 0 + x; i < 1000; ++i)
z = y / x;
z = x / y;
return z;
}
function runTest()
{
ok(isNaN(doDiv(0.0, 0.0)), "Undefined division-by-zero doesn't crash");
try {
document.getElementById('plugin1').enableFPExceptions();
}
catch (e) {
ok(true, "No special code to set the FPU bit in the testplugin.");
SimpleTest.finish();
return;
}
ok(isNaN(doDiv(0.0, 0.0)), "Undefined division-by-zero doesn't crash again.");
SimpleTest.finish();
}
</script>