commit 32603f686e3d006d60633a52d0cf9f6cd6cdc2ef Author: Alex Catarineu <acat@torproject.org> Date: Thu Apr 9 13:23:40 2020 +0200 Bug 32174: replace XUL <textbox> with <html:input> --- src/chrome/content/network-settings-shared.js | 10 +++++----- src/chrome/content/network-settings.js | 4 ++-- src/chrome/content/network-settings.xhtml | 2 +- src/chrome/skin/network-settings.css | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/network-settings-shared.js b/src/chrome/content/network-settings-shared.js index 1575f3d..b125d24 100644 --- a/src/chrome/content/network-settings-shared.js +++ b/src/chrome/content/network-settings-shared.js @@ -40,11 +40,11 @@ var proxySettings = ` <label value="&torsettings.useProxy.address;" control="proxyAddr" class="rightAlign"/> <hbox align="center"> - <textbox id="proxyAddr" size="20" flex="1" + <html:input id="proxyAddr" size="20" style="-moz-box-flex: 1;" placeholder="&torsettings.useProxy.address.placeholder;"/> <separator orient="vertical"/> <label value="&torsettings.useProxy.port;" control="proxyPort"/> - <textbox id="proxyPort" size="4"/> + <html:input id="proxyPort" size="4"/> </hbox> </row> <row align="center"> @@ -52,13 +52,13 @@ var proxySettings = ` value="&torsettings.useProxy.username;" control="proxyUsername" class="rightAlign"/> <hbox align="center"> - <textbox id="proxyUsername" size="14" flex="1" + <html:input id="proxyUsername" size="14" style="-moz-box-flex: 1;" placeholder="&torsettings.optional;"/> <separator orient="vertical"/> <label id="proxyPasswordLabel" value="&torsettings.useProxy.password;" control="proxyPassword"/> - <textbox id="proxyPassword" size="14" type="password" + <html:input id="proxyPassword" size="14" type="password" placeholder="&torsettings.optional;"/> </hbox> </row> @@ -175,7 +175,7 @@ var bridgeDBRequestOverlayContent = ` <hbox> <spacer id="bridgeDBReloadSpacer"/> <spacer flex="1"/> - <textbox id="bridgeDBCaptchaSolution" size="35" + <html:input id="bridgeDBCaptchaSolution" size="35" placeholder="&torsettings.useBridges.captchaSolution.placeholder;" oninput="onCaptchaSolutionChange()"/> <spacer flex="1"/> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 4b5a9af..9692b40 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -2489,7 +2489,7 @@ function setElemValue(aID, aValue) toggleElemUI(elem); break; case "html:textarea": - case "textbox": + case "html:input": if (Array.isArray(aValue)) { val = ""; @@ -2555,7 +2555,7 @@ function getElemValue(aID, aDefaultValue) rv = elem.selected; break; case "html:textarea": - case "textbox": + case "html:input": case "menulist": case "richlistbox": rv = elem.value; diff --git a/src/chrome/content/network-settings.xhtml b/src/chrome/content/network-settings.xhtml index 1d3423e..faf2dc9 100644 --- a/src/chrome/content/network-settings.xhtml +++ b/src/chrome/content/network-settings.xhtml @@ -41,7 +41,7 @@ <hbox align="center"> <label value="&torsettings.firewall.allowedPorts;" control="firewallAllowedPorts"/> - <textbox id="firewallAllowedPorts" value="80,443"/> + <html:input id="firewallAllowedPorts" value="80,443"/> </hbox> </groupbox> </vbox> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index aae7c0b..c9452d8 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -307,7 +307,7 @@ html|textarea { .os-windows label, .os-windows description, .os-windows html|textarea, -.os-windows textbox +.os-windows html|input { font-size: 120% !important; }