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

Bug 1703164 - convert mail/components/extensions/extensionPopup.xhtml to top level <html>. r=john.bieling 

Differential Revision: https://phabricator.services.mozilla.com/D160172

--HG--
extra : rebase_source : bedcfb7ff7021dac5ef5711a8248799d0a23c49a
This commit is contained in:
Magnus Melin 2022-10-25 17:01:04 +11:00
Родитель 9078231f81
Коммит 73dacccf51
2 изменённых файлов: 27 добавлений и 27 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
mail/components/extensions/extensionPopup.js
Просмотреть файл

@ -23,6 +23,8 @@ var gContextMenu;
/* globals nsContextMenu, reporterListener */
window.addEventListener("DOMContentLoaded", loadRequestedUrl);
function loadRequestedUrl() {
let browser = document.getElementById("requestFrame");
browser.addProgressListener(reporterListener, Ci.nsIWebProgress.NOTIFY_ALL);

52
mail/components/extensions/extensionPopup.xhtml
Просмотреть файл

@ -11,32 +11,34 @@
<?xml-stylesheet href="chrome://messenger/skin/browserRequest.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/extensionPopup.css" type="text/css"?>
<!DOCTYPE window [
<!DOCTYPE html [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
%brandDTD;
<!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd">
%messengerDTD;
]>
<window id="browserRequest"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
windowtype="mail:extensionPopup"
buttons=","
onload="loadRequestedUrl()"
title="&titledefault.label;"
titlemodifier="&titledefault.label;"
titlemenuseparator="&titleSeparator.label;"
width="800"
height="500"
orient="vertical">
<script src="chrome://communicator/content/utilityOverlay.js"/>
<script src="chrome://global/content/contentAreaUtils.js"/>
<script src="chrome://global/content/editMenuOverlay.js"/>
<script src="chrome://global/content/globalOverlay.js"/>
<script src="chrome://messenger/content/viewZoomOverlay.js"/>
<script src="chrome://messenger/content/browserRequest.js"/>
<script src="chrome://messenger/content/extensionPopup.js"/>
<script src="chrome://messenger/content/nsContextMenu.js"/>
<html id="browserRequest" xmlns="http://www.w3.org/1999/xhtml"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
windowtype="mail:extensionPopup"
titlemodifier="&titledefault.label;"
titlemenuseparator="&titleSeparator.label;"
width="800" height="500"
scrolling="false">
<head>
<title>&titledefault.label;</title>
<link rel="localization" href="toolkit/global/textActions.ftl" />
<link rel="localization" href="messenger/messenger.ftl" />
<script defer="defer" src="chrome://communicator/content/utilityOverlay.js"></script>
<script defer="defer" src="chrome://global/content/contentAreaUtils.js"></script>
<script defer="defer" src="chrome://global/content/editMenuOverlay.js"></script>
<script defer="defer" src="chrome://global/content/globalOverlay.js"></script>
<script defer="defer" src="chrome://messenger/content/viewZoomOverlay.js"></script>
<script defer="defer" src="chrome://messenger/content/browserRequest.js"></script>
<script defer="defer" src="chrome://messenger/content/nsContextMenu.js"></script>
<script defer="defer" src="chrome://messenger/content/extensionPopup.js"></script>
</head>
<html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<popupset>
#define BROWSER_POPUPS_ONLY
@ -52,11 +54,6 @@
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<linkset>
<html:link rel="localization" href="toolkit/global/textActions.ftl"/>
<html:link rel="localization" href="messenger/messenger.ftl"/>
</linkset>
<!-- Use the same styling and semantics as content tabs. -->
<html:div id="header" class="contentTabAddress">
<html:img id="security-icon" class="contentTabSecurity" />
@ -74,4 +71,5 @@
selectmenulist="ContentSelectDropdown"
messagemanagergroup="browsers"/>
</stack>
</window>
</html:body>
</html>