Bug 1597964 - Restructure all <xul:dialog> usages such that they are not the top level element in chat/. r=mkmelin

This commit is contained in:
Khushil Mistry 2019-12-11 17:28:00 +13:00
Родитель 1cfb4acfcf
Коммит f1aa0b1c4e
5 изменённых файлов: 172 добавлений и 168 удалений

Просмотреть файл

@ -70,7 +70,7 @@ var otrAddFinger = {
this.fingerError.hidden = true;
}
document.documentElement.getButton("accept").disabled =
document.getElementById("otrAddFingerDialog").getButton("accept").disabled =
input.value && !input.validity.valid;
this.keyCount.value = `${hex.length}/40`;

Просмотреть файл

@ -6,14 +6,14 @@
<?xml-stylesheet href="chrome://global/skin/" type="text/css" ?>
<?xml-stylesheet href="chrome://chat/skin/otrFingerprintDialog.css" type="text/css"?>
<!DOCTYPE dialog>
<!DOCTYPE window>
<dialog id="otrAddFingerDialog"
data-l10n-id="otr-add-finger"
<window data-l10n-id="otr-add-finger"
windowtype="OTR:AddFinger"
onload="otrAddFinger.onload()"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:html="http://www.w3.org/1999/xhtml">
<dialog id="otrAddFingerDialog"
buttons="accept,cancel"
buttondisabledaccept="true">
@ -62,3 +62,4 @@
</vbox>
</vbox>
</dialog>
</window>

Просмотреть файл

@ -173,7 +173,9 @@ var otrAuth = {
},
oninput(e) {
document.documentElement.getButton("accept").disabled = !e.value;
document
.getElementById("otrAuthDialog")
.getButton("accept").disabled = !e.value;
},
how() {

Просмотреть файл

@ -6,15 +6,15 @@
<?xml-stylesheet href="chrome://global/skin/" type="text/css" ?>
<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
<!DOCTYPE dialog>
<dialog
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
<!DOCTYPE winodw>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
id="otrAuthDialog"
data-l10n-id="otr-auth"
data-l10n-attrs="buttonlabelaccept"
windowtype="OTR:Auth"
onload="otrAuth.onload()"
onload="otrAuth.onload()">
<dialog id="otrAuthDialog"
buttons="accept,cancel,help"
buttondisabledaccept="true">
@ -90,5 +90,5 @@
aria-labelledby="responseLabel"
oninput="otrAuth.oninput(this)"/>
</groupbox>
</dialog>
<dialog>
</window>

Просмотреть файл

@ -5,15 +5,15 @@
<?xml-stylesheet href="chrome://global/skin/" type="text/css" ?>
<!DOCTYPE dialog>
<!DOCTYPE window>
<dialog
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
id="otr-fingerwindow"
data-l10n-id="otr-finger"
data-l10n-attrs="buttonlabelaccept"
onload="otrFinger.onload()"
onload="otrFinger.onload()">
<dialog id="otr-fingerwindow"
buttons="accept">
<linkset>
@ -52,3 +52,4 @@
</hbox>
</vbox>
</dialog>
</window>