diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /toolkit/mozapps/extensions/test/xpinstall/installtrigger_frame.html | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'toolkit/mozapps/extensions/test/xpinstall/installtrigger_frame.html')
| -rw-r--r-- | toolkit/mozapps/extensions/test/xpinstall/installtrigger_frame.html | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/toolkit/mozapps/extensions/test/xpinstall/installtrigger_frame.html b/toolkit/mozapps/extensions/test/xpinstall/installtrigger_frame.html deleted file mode 100644 index 2b302642e..000000000 --- a/toolkit/mozapps/extensions/test/xpinstall/installtrigger_frame.html +++ /dev/null @@ -1,29 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - -<html> - -<!-- This page will accept some url as the uri query and load it in - an inner iframe, which will run InstallTrigger.install --> - -<head> -<title>InstallTrigger frame tests</title> -<script type="text/javascript"> -function prepChild() { - // Pass our parameters over to the child - var child = window.frames[0]; - var url = decodeURIComponent(document.location.search.substr(1)); - child.location = url; -} -</script> -</head> -<body onload="prepChild()"> - -<iframe src="about:blank"> -</iframe> - -<p>InstallTrigger tests</p> -<p id="return"></p> -<p id="status"></p> -</body> -</html> |