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

Backout 34a7d2909954 (bug 780546) for causing bug 780761 one push later on a CLOSED TREE

This commit is contained in:
Ed Morley 2012-08-07 00:03:29 +01:00
Родитель 6f3dfcd32a
Коммит 086c58eec5
6 изменённых файлов: 0 добавлений и 102 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
dom/browser-element/mochitest/Makefile.in
Просмотреть файл

@ -88,10 +88,6 @@ MOCHITEST_FILES = \
browserElement_OpenWindowDifferentOrigin.js \
test_browserElement_inproc_OpenWindowDifferentOrigin.html \
file_browserElement_OpenWindowDifferentOrigin.html \
browserElement_OpenNamed.js \
test_browserElement_inproc_OpenNamed.html \
file_browserElement_OpenNamed.html \
file_browserElement_OpenNamed2.html \
browserElement_SecurityChange.js \
test_browserElement_inproc_SecurityChange.html \
file_browserElement_SecurityChange.html \
@ -143,7 +139,6 @@ MOCHITEST_FILES += \
test_browserElement_oop_OpenWindowInFrame.html \
test_browserElement_oop_OpenWindowRejected.html \
test_browserElement_oop_OpenWindowDifferentOrigin.html \
test_browserElement_oop_OpenNamed.html \
test_browserElement_oop_SecurityChange.html \
test_browserElement_oop_BackForward.html \
test_browserElement_oop_Reload.html \

57
dom/browser-element/mochitest/browserElement_OpenNamed.js
Просмотреть файл

@ -1,57 +0,0 @@
/* Any copyright is dedicated to the public domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
// Bug 742944 - In <iframe mozbrowser>, test that if we call window.open twice
// with the same name, we get only one mozbrowseropenwindow event.
"use strict";
SimpleTest.waitForExplicitFinish();
var iframe;
var popupFrame;
function runTest() {
browserElementTestHelpers.setEnabledPref(true);
browserElementTestHelpers.addToWhitelist();
iframe = document.createElement('iframe');
iframe.mozbrowser = true;
var gotPopup = false;
iframe.addEventListener('mozbrowseropenwindow', function(e) {
is(gotPopup, false, 'Should get just one popup.');
gotPopup = true;
popupFrame = e.detail.frameElement;
// Called when file_browserElement_OpenNamed2.html loads into popupFrame.
popupFrame.addEventListener('mozbrowsershowmodalprompt', function promptlistener(e) {
popupFrame.removeEventListener('mozbrowsershowmodalprompt', promptlistener);
ok(gotPopup, 'Got openwindow event before showmodalprompt event.');
is(e.detail.message, 'success: loaded');
SimpleTest.executeSoon(test2);
});
document.body.appendChild(popupFrame);
});
// OpenNamed.html will call
//
// window.open('file_browserElement_OpenNamed2.html', 'OpenNamed').
//
// Once that popup loads, we reload OpenNamed.html. That will call
// window.open again, but we shouldn't get another openwindow event, because
// we're opening into the same named window.
iframe.src = 'file_browserElement_OpenNamed.html';
document.body.appendChild(iframe);
}
function test2() {
popupFrame.addEventListener('mozbrowsershowmodalprompt', function(e) {
is(e.detail.message, 'success: loaded');
SimpleTest.finish();
});
iframe.src = 'file_browserElement_OpenNamed.html?test2';
}
runTest();

7
dom/browser-element/mochitest/file_browserElement_OpenNamed.html
Просмотреть файл

@ -1,7 +0,0 @@
<html>
<body>
<script>
window.open('file_browserElement_OpenNamed2.html', 'OpenNamed');
</script>
</body>
</html>

7
dom/browser-element/mochitest/file_browserElement_OpenNamed2.html
Просмотреть файл

@ -1,7 +0,0 @@
<html>
<body>
<script>
alert('success: loaded');
</script>
</body>
</html>

13
dom/browser-element/mochitest/test_browserElement_inproc_OpenNamed.html
Просмотреть файл

@ -1,13 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test of browser element.</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="browserElementTestHelpers.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<script type="application/javascript;version=1.7" src="browserElement_OpenNamed.js">
</script>
</body>
</html>

13
dom/browser-element/mochitest/test_browserElement_oop_OpenNamed.html
Просмотреть файл

@ -1,13 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test of browser element.</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="browserElementTestHelpers.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<script type="application/javascript;version=1.7" src="browserElement_OpenNamed.js">
</script>
</body>
</html>