Bug 1453322 - Part 1: revert bug 1453233. r=jorgk

This commit is contained in:
Jorg K 2018-04-14 00:25:49 +02:00
Родитель 0f91b192bf
Коммит c33953ee84
18 изменённых файлов: 32 добавлений и 113 удалений

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

@ -14,10 +14,8 @@ var accountOptionsHelper = {
container.appendChild(label);
let textbox = document.createElement("textbox");
if (aType) {
if (aType)
textbox.setAttribute("type", aType);
textbox.setAttribute("hidespinbuttons", "true");
}
textbox.setAttribute("value", aValue);
textbox.setAttribute("id", aName);
textbox.setAttribute("flex", "1");

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

@ -329,8 +329,8 @@ type="bool"/>
<hbox align="center" class="indent">
<label id="useCacheBefore" control="cacheSize"
accesskey="&useCacheBefore.accesskey;" value="&useCacheBefore.label;"/>
<textbox id="cacheSize" type="number" hidespinbuttons="true" max="1024"
preference="browser.cache.disk.capacity" class="size-input"
<textbox id="cacheSize" type="number" size="4" max="1024"
preference="browser.cache.disk.capacity"
onsyncfrompreference="return gAdvancedPane.readCacheSize();"
onsynctopreference="return gAdvancedPane.writeCacheSize();"
aria-labelledby="useCacheBefore cacheSize useCacheAfter"/>
@ -343,9 +343,9 @@ type="bool"/>
command="cmd_toggleCompact"
aria-labelledby="offlineCompactFolder offlineCompactFolderMin compactFolderMB"
preference="mail.prompt_purge_threshhold"/>
<textbox id="offlineCompactFolderMin" hidespinbuttons="true" value="20"
<textbox id="offlineCompactFolderMin" size="4" value="20"
type="number" min="1" max="2048" increment="10"
preference="mail.purge_threshhold_mb" class="size-input"
preference="mail.purge_threshhold_mb"
aria-labelledby="offlineCompactFolder offlineCompactFolderMin compactFolderMB"/>
<label id="compactFolderMB" value="&offlineCompactFoldersMB.label;"/>
</hbox>

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

@ -62,8 +62,8 @@
<checkbox id="reportIdle" label="&reportIdleAfter.label;"
accesskey="&reportIdleAfter.accesskey;"
preference="messenger.status.reportIdle"/>
<textbox id="timeBeforeAway" class="size-input" type="number" min="1" max="720"
observes="idleReportingEnabled" hidespinbuttons="true"
<textbox id="timeBeforeAway" type="number" min="1" max="720"
observes="idleReportingEnabled"
preference="messenger.status.timeBeforeIdle"
onsyncfrompreference="var elt = document.getElementById(this.getAttribute('preference'));
return (elt.instantApply ? elt.valueFromPreferences : elt.value) / 60;"

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

@ -75,7 +75,6 @@
<checkbox id="autoSave" label="&autoSave.label;" preference="mail.compose.autosave"
accesskey="&autoSave.accesskey;" command="cmd_toggleAutosave"/>
<textbox id="autoSaveInterval"
class="size-input" hidespinbuttons="true"
size="2" type="number" min="1" max="35790"
preference="mail.compose.autosaveinterval"
aria-labelledby="autoSave autoSaveInterval autoSaveEnd"/>

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

@ -76,8 +76,7 @@
<textbox id="networkProxyHTTP" flex="1" class="uri-element"
preference="network.proxy.http" onsyncfrompreference="return gConnectionsDialog.readHTTPProxyServer();"/>
<label value="&HTTPport.label;" accesskey="&HTTPport.accesskey;" control="networkProxyHTTP_Port"/>
<textbox id="networkProxyHTTP_Port" class="proxy-port-input"
type="number" max="65535" hidespinbuttons="true"
<textbox id="networkProxyHTTP_Port" type="number" max="65535" size="5"
preference="network.proxy.http_port"
onsyncfrompreference="return gConnectionsDialog.readHTTPProxyPort();"/>
</hbox>
@ -99,8 +98,7 @@
preference="network.proxy.ssl"
onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('ssl', false);"/>
<label value="&SSLport.label;" accesskey="&SSLport.accesskey;" control="networkProxySSL_Port"/>
<textbox id="networkProxySSL_Port" class="proxy-port-input"
type="number" max="65535" hidespinbuttons="true"
<textbox id="networkProxySSL_Port" type="number" max="65535" size="5"
preference="network.proxy.ssl_port"
onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('ssl', true);"/>
</hbox>
@ -114,8 +112,7 @@
preference="network.proxy.socks"
onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('socks', false);"/>
<label value="&SOCKSport.label;" accesskey="&SOCKSport.accesskey;" control="networkProxySOCKS_Port"/>
<textbox id="networkProxySOCKS_Port" class="proxy-port-input"
type="number" max="65535" hidespinbuttons="true"
<textbox id="networkProxySOCKS_Port" type="number" max="65535" size="5"
preference="network.proxy.socks_port"
onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('socks', true);"/>
</hbox>

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

@ -37,8 +37,7 @@
control="totalOpenTime"
value="&totalOpenTimeBefore.label;"
accesskey="&totalOpenTimeBefore.accesskey;"/>
<textbox id="totalOpenTime" type="number" class="size-input"
size="3" min="1" max="3600" increment="1" hidespinbuttons="true"
<textbox id="totalOpenTime" type="number" size="3" min="1" max="3600" increment="1"
preference="alerts.totalOpenTime"
onsyncfrompreference="return document.getElementById(this.getAttribute('preference')).value / 1000;"
onsynctopreference="return this.value * 1000;"/>

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

@ -93,16 +93,3 @@ dialogheader {
font-size: larger;
font-weight: bold;
}
/* Input field sizes */
.value-input {
width: 5ch;
}
.number-input {
width: 6ch;
}
.port-input {
width: 7ch;
}

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

@ -309,12 +309,3 @@ a {
list-style-image: url("chrome://global/skin/icons/loading@2x.png");
}
}
/* Input field sizes */
.size-input {
width: calc(4ch + 24px); /* 4 chars + 12px padding on both sides */
}
.proxy-port-input {
width: calc(5ch + 24px); /* 5 chars + 12px padding on both sides */
}

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

@ -106,16 +106,3 @@ dialogheader {
.dialogheader-description {
font-weight: bold !important;
}
/* Input field sizes */
.value-input {
width: 5ch;
}
.number-input {
width: 6ch;
}
.port-input {
width: 7ch;
}

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

@ -406,12 +406,3 @@ a {
#provider-account-settings {
-moz-box-flex: 0;
}
/* Input field sizes */
.size-input {
width: calc(4ch + 24px); /* 4 chars + 12px padding on both sides */
}
.proxy-port-input {
width: calc(5ch + 24px); /* 5 chars + 12px padding on both sides */
}

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

@ -93,16 +93,3 @@ dialogheader {
font-size: larger;
font-weight: bold;
}
/* Input field sizes */
.value-input {
width: 5ch;
}
.number-input {
width: 6ch;
}
.port-input {
width: 7ch;
}

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

@ -323,12 +323,3 @@ a {
list-style-image: url("chrome://global/skin/icons/loading@2x.png");
}
}
/* Input field sizes */
.size-input {
width: calc(4ch + 24px); /* 4 chars + 12px padding on both sides */
}
.proxy-port-input {
width: calc(5ch + 24px); /* 5 chars + 12px padding on both sides */
}

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

@ -57,11 +57,10 @@
control="smtp.port"/>
<hbox align="center">
<textbox id="smtp.port"
style="width: 6ch"
type="number"
min="0"
max="65535"
hidespinbuttons="true"
size="5"
preftype="int"
prefstring="mail.smtpserver.%serverkey%.port"/>
<label value="&serverPortDefault.label;"/>

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

@ -202,11 +202,10 @@
accesskey="&purge1.accesskey;"
oncommand="updateJunkRetention();"
label="&purge1.label;"/>
<textbox type="number"
<textbox size="3"
type="number"
min="1"
id="server.purgeSpamInterval"
class="value-input"
hidespinbuttons="true"
genericattr="true"
pref="true"
wsm_persist="true"

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

@ -62,8 +62,8 @@
<hbox flex="1" align="center">
<radio id="useAutosync.ByAge" accesskey="&ageAutosync.accesskey;"
value="1" label="&ageAutosyncBefore.label;" oncommand="onAutosyncChange();"/>
<textbox id="autosyncValue" type="number" class="autosync number-input" min="1"
hidespinbuttons="true" onchange="onAutosyncChange();"
<textbox id="autosyncValue" type="number" size="4" min="1"
class="autosync" onchange="onAutosyncChange();"
aria-labelledby="ageAutosyncBefore autosyncValue ageAutosyncMiddle autosyncInterval ageAutosyncAfter"/>
<label id="ageAutosyncMiddle" control="autosyncValue" value="&ageAutosyncMiddle.label;"/>
<menulist id="autosyncInterval" onselect="onAutosyncChange();">
@ -95,8 +95,7 @@
accesskey="&autosyncNotDownload.accesskey;"
oncommand="onAutosyncNotDownload();"/>
<textbox wsm_persist="true" id="offline.notDownloadMin"
hidespinbuttons="true" class="number-input"
type="number" min="1" increment="10" value="50"
type="number" min="1" increment="10" size="4" value="50"
aria-labelledby="offline.notDownload offline.notDownloadMin kbLabel"/>
<label value="&kb.label;" control="offline.notDownloadMin" id="kbLabel"/>
</hbox>
@ -107,8 +106,7 @@
accesskey="&nntpDownloadMsg.accesskey;"
oncommand="onCheckItem('nntp.downloadMsgMin', 'nntp.downloadMsg');"/>
<textbox wsm_persist="true" id="nntp.downloadMsgMin"
hidespinbuttons="true" class="value-input"
type="number" min="1" value="30"
type="number" min="1" size="2" value="30"
aria-labelledby="nntp.downloadMsg nntp.downloadMsgMin daysOldLabel"/>
<label value="&daysOld.label;" control="nntp.downloadMsgMin"
id="daysOldLabel"/>
@ -127,16 +125,16 @@
<hbox flex="1" align="center">
<radio id="retention.keepNewMsg" accesskey="&retentionKeepRecent.accesskey;"
value="3" label="&retentionKeepRecent.label;" oncommand="onCheckKeepMsg();"/>
<textbox id="retention.keepNewMsgMin" hidespinbuttons="true"
type="number" class="number-input" min="1" increment="10" value="2000"
<textbox id="retention.keepNewMsgMin"
type="number" min="1" increment="10" size="4" value="2000"
aria-labelledby="retention.keepNewMsg retention.keepNewMsgMin newMsgLabel"/>
<label value="&message.label;" control="retention.keepNewMsgMin" id="newMsgLabel"/>
</hbox>
<hbox flex="1" align="center">
<radio id="retention.keepOldMsg" accesskey="&retentionKeepMsg.accesskey;"
value="2" label="&retentionKeepMsg.label;" oncommand="onCheckKeepMsg();"/>
<textbox id="retention.keepOldMsgMin" class="number-input"
type="number" hidespinbuttons="true" min="1" value="30"
<textbox id="retention.keepOldMsgMin"
type="number" min="1" size="4" value="30"
aria-labelledby="retention.keepOldMsg retention.keepOldMsgMin oldMsgLabel"/>
<label value="&daysOld.label;" control="retention.keepOldMsgMin" id="oldMsgLabel"/>
</hbox>
@ -151,8 +149,8 @@
<hbox align="center" class="indent" hidefor="movemail,pop3,imap,none,rss">
<checkbox id="nntp.removeBody" accesskey="&nntpRemoveMsgBody.accesskey;"
label="&nntpRemoveMsgBody.label;" oncommand="onCheckItem('nntp.removeBodyMin','nntp.removeBody');"/>
<textbox id="nntp.removeBodyMin" class="value-input" value="30"
type="number" min="1" hidespinbuttons="true"
<textbox id="nntp.removeBodyMin" size="2" value="30"
type="number" min="1"
aria-labelledby="nntp.removeBody nntp.removeBodyMin daysOldMsg"/>
<label value="&daysOld.label;" control="nntp.removeBodyMin" id="daysOldMsg"/>
</hbox>

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

@ -49,8 +49,7 @@
<label control="maximumConnectionsNumber"
value="&maximumConnectionsNumber.label;"
accesskey="&maximumConnectionsNumber.accesskey;"/>
<textbox amsa_persist="true" type="number"
class="value-input" hidespinbuttons="true"
<textbox amsa_persist="true" size="3" type="number"
min="1" max="1000" id="maximumConnectionsNumber"/>
</hbox>
</row>

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

@ -68,8 +68,7 @@
accesskey="&port.accesskey;" control="server.port"/>
<label id="fixedServerPort" hidefor="movemail"
collapsed="true" use="server.port"/>
<textbox wsm_persist="true" id="server.port"
class="value-input" hidespinbuttons="true"
<textbox wsm_persist="true" size="3" id="server.port"
preftype="int" hidefor="movemail"
prefstring="mail.server.%serverkey%.port"
type="number" min="1" max="65535" increment="1"/>
@ -170,9 +169,8 @@
prefstring="mail.server.%serverkey%.check_new_mail"/>
<textbox wsm_persist="true"
id="server.biffMinutes"
class="value-input"
type="number"
hidespinbuttons="true"
size="3"
min="1"
increment="1"
aria-labelledby="server.doBiff server.biffMinutes biffEnd"
@ -220,9 +218,9 @@
accesskey="&deleteByAgeFromServer.accesskey;"
prefattribute="value"
prefstring="mail.server.%serverkey%.delete_by_age_from_server"/>
<textbox wsm_persist="true" id="pop3.numDaysToLeaveOnServer" class="value-input"
<textbox wsm_persist="true" id="pop3.numDaysToLeaveOnServer" size="3"
aria-labelledby="pop3.deleteByAgeFromServer pop3.numDaysToLeaveOnServer daysEnd"
preftype="int" type="number" min="1" increment="1" hidespinbuttons="true"
preftype="int" type="number" min="1" increment="1"
prefstring="mail.server.%serverkey%.num_days_to_leave_on_server"/>
<label id="daysEnd" control="pop3.numDaysToLeaveOnServer" value="&daysEnd.label;"/>
</hbox>
@ -341,9 +339,9 @@
prefattribute="value"
prefstring="mail.server.%serverkey%.notify.on"/>
<textbox wsm_persist="true" id="nntp.maxArticles"
type="number" class="number-input" min="1" increment="10"
type="number" size="4" min="1" increment="10"
aria-labelledby="nntp.notifyOn nntp.maxArticles maxMessagesEnd"
preftype="int" hidespinbuttons="true"
preftype="int"
prefstring="mail.server.%serverkey%.max_articles"/>
<label control="nntp.maxArticles" value="&maxMessagesEnd.label;" id="maxMessagesEnd"/>
</hbox>

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

@ -78,10 +78,9 @@
oncommand="setPrefs(this)"/>
<textbox id="updateValue"
type="number"
class="value-input"
size="3"
min="1"
increment="1"
hidespinbuttons="true"
aria-labelledby="updateEnabled updateValue biffMinutes biffDays"
onchange="setPrefs(this)"/>
<radiogroup id="biffUnits"