зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1436568 - Make "clear your recent history" a button instead of a link. r=nhnt11
MozReview-Commit-ID: 1KDXu9OtmHm --HG-- extra : rebase_source : 7046240e28ac035f839d80d88e50d7522d2cef5b
This commit is contained in:
Родитель
9beab572d0
Коммит
f2c5d2f4ff
|
@ -268,17 +268,11 @@ var gPrivacyPane = {
|
|||
gPrivacyPane.updatePrivacyMicroControls();
|
||||
gPrivacyPane.updateAutostart();
|
||||
});
|
||||
setEventListener("historyRememberClear", "click", function(event) {
|
||||
if (event.button == 0) {
|
||||
gPrivacyPane.clearPrivateDataNow(false);
|
||||
}
|
||||
return false;
|
||||
});
|
||||
setEventListener("historyDontRememberClear", "click", function(event) {
|
||||
if (event.button == 0) {
|
||||
gPrivacyPane.clearPrivateDataNow(true);
|
||||
}
|
||||
return false;
|
||||
setEventListener("clearHistoryButton", "command", function() {
|
||||
let historyMode = document.getElementById("historyMode");
|
||||
// Select "everything" in the clear history dialog if the
|
||||
// user has set their history mode to never remember history.
|
||||
gPrivacyPane.clearPrivateDataNow(historyMode.value == "dontremember");
|
||||
});
|
||||
setEventListener("openSearchEnginePreferences", "click", function(event) {
|
||||
if (event.button == 0) {
|
||||
|
|
|
@ -75,14 +75,8 @@
|
|||
<hbox>
|
||||
<menulist id="historyMode">
|
||||
<menupopup>
|
||||
<menuitem label="&historyHeader.remember.label;" value="remember" searchkeywords="&rememberDescription.label;
|
||||
&dontrememberActions.pre.label;
|
||||
&dontrememberActions.clearHistory.label;
|
||||
&dontrememberActions.post.label;"/>
|
||||
<menuitem label="&historyHeader.dontremember.label;" value="dontremember" searchkeywords="&dontrememberDescription.label;
|
||||
&dontrememberActions.pre.label;
|
||||
&dontrememberActions.clearHistory.label;
|
||||
&dontrememberActions.post.label;"/>
|
||||
<menuitem label="&historyHeader.remember.label;" value="remember" searchkeywords="&rememberDescription.label;"/>
|
||||
<menuitem label="&historyHeader.dontremember.label;" value="dontremember" searchkeywords="&dontrememberDescription.label;"/>
|
||||
<menuitem label="&historyHeader.custom.label;" value="custom" searchkeywords="&privateBrowsingPermanent2.label;
|
||||
&rememberHistory2.label;
|
||||
&rememberSearchForm.label;
|
||||
|
@ -102,71 +96,74 @@
|
|||
</hbox>
|
||||
<label>&historyHeader.post.label;</label>
|
||||
</hbox>
|
||||
<deck id="historyPane">
|
||||
<vbox id="historyRememberPane">
|
||||
<hbox align="center" flex="1">
|
||||
<vbox flex="1">
|
||||
<description>&rememberDescription.label;</description>
|
||||
<description>&dontrememberActions.pre.label;<label
|
||||
class="text-link" id="historyRememberClear"
|
||||
>&dontrememberActions.clearHistory.label;</label>&dontrememberActions.post.label;</description>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
<vbox id="historyDontRememberPane">
|
||||
<hbox align="center" flex="1">
|
||||
<vbox flex="1">
|
||||
<description>&dontrememberDescription.label;</description>
|
||||
<description>&dontrememberActions.pre.label;<label
|
||||
class="text-link" id="historyDontRememberClear"
|
||||
>&dontrememberActions.clearHistory.label;</label>&dontrememberActions.post.label;</description>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
<vbox id="historyCustomPane">
|
||||
<vbox>
|
||||
<checkbox id="privateBrowsingAutoStart"
|
||||
label="&privateBrowsingPermanent2.label;"
|
||||
accesskey="&privateBrowsingPermanent2.accesskey;"
|
||||
preference="browser.privatebrowsing.autostart"/>
|
||||
<vbox class="indent">
|
||||
<checkbox id="rememberHistory"
|
||||
label="&rememberHistory2.label;"
|
||||
accesskey="&rememberHistory2.accesskey;"
|
||||
preference="places.history.enabled"/>
|
||||
<checkbox id="rememberForms"
|
||||
label="&rememberSearchForm.label;"
|
||||
accesskey="&rememberSearchForm.accesskey;"
|
||||
preference="browser.formfill.enable"/>
|
||||
<hbox id="clearDataBox"
|
||||
align="center">
|
||||
<checkbox id="alwaysClear"
|
||||
preference="privacy.sanitize.sanitizeOnShutdown"
|
||||
label="&clearOnClose.label;"
|
||||
accesskey="&clearOnClose.accesskey;"
|
||||
flex="1" />
|
||||
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
|
||||
<hbox>
|
||||
<button id="clearDataSettings"
|
||||
class="accessory-button"
|
||||
label="&clearOnCloseSettings.label;"
|
||||
accesskey="&clearOnCloseSettings.accesskey;"
|
||||
searchkeywords="&clearDataSettings3.label;
|
||||
&historySection.label;
|
||||
&itemHistoryAndDownloads.label;
|
||||
&itemCookies.label;
|
||||
&itemActiveLogins.label;
|
||||
&itemCache.label;
|
||||
&itemFormSearchHistory.label;
|
||||
&dataSection.label;
|
||||
&itemSitePreferences.label;
|
||||
&itemOfflineApps.label;"/>
|
||||
<hbox>
|
||||
<deck id="historyPane" flex="1">
|
||||
<vbox id="historyRememberPane">
|
||||
<hbox align="center" flex="1">
|
||||
<vbox flex="1">
|
||||
<description>&rememberDescription.label;</description>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
<vbox id="historyDontRememberPane">
|
||||
<hbox align="center" flex="1">
|
||||
<vbox flex="1">
|
||||
<description>&dontrememberDescription.label;</description>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
<vbox id="historyCustomPane">
|
||||
<vbox>
|
||||
<checkbox id="privateBrowsingAutoStart"
|
||||
label="&privateBrowsingPermanent2.label;"
|
||||
accesskey="&privateBrowsingPermanent2.accesskey;"
|
||||
preference="browser.privatebrowsing.autostart"/>
|
||||
<vbox class="indent">
|
||||
<checkbox id="rememberHistory"
|
||||
label="&rememberHistory2.label;"
|
||||
accesskey="&rememberHistory2.accesskey;"
|
||||
preference="places.history.enabled"/>
|
||||
<checkbox id="rememberForms"
|
||||
label="&rememberSearchForm.label;"
|
||||
accesskey="&rememberSearchForm.accesskey;"
|
||||
preference="browser.formfill.enable"/>
|
||||
<hbox id="clearDataBox"
|
||||
align="center">
|
||||
<checkbox id="alwaysClear"
|
||||
preference="privacy.sanitize.sanitizeOnShutdown"
|
||||
label="&clearOnClose.label;"
|
||||
accesskey="&clearOnClose.accesskey;"
|
||||
flex="1" />
|
||||
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
|
||||
<hbox>
|
||||
<button id="clearDataSettings"
|
||||
class="accessory-button"
|
||||
label="&clearOnCloseSettings.label;"
|
||||
accesskey="&clearOnCloseSettings.accesskey;"
|
||||
searchkeywords="&clearDataSettings3.label;
|
||||
&historySection.label;
|
||||
&itemHistoryAndDownloads.label;
|
||||
&itemCookies.label;
|
||||
&itemActiveLogins.label;
|
||||
&itemCache.label;
|
||||
&itemFormSearchHistory.label;
|
||||
&dataSection.label;
|
||||
&itemSitePreferences.label;
|
||||
&itemOfflineApps.label;"/>
|
||||
</hbox>
|
||||
</hbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</vbox>
|
||||
</vbox>
|
||||
</deck>
|
||||
<vbox align="end">
|
||||
<button id="clearHistoryButton"
|
||||
class="accessory-button"
|
||||
icon="clear"
|
||||
label="&clearHistoryButton.label;"
|
||||
accesskey="&clearHistoryButton.accesskey;"/>
|
||||
</vbox>
|
||||
</deck>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
|
||||
<!-- Site Data -->
|
||||
|
|
|
@ -70,11 +70,8 @@
|
|||
|
||||
<!ENTITY dontrememberDescription.label "&brandShortName; will use the same settings as private browsing, and will not remember any history as you browse the Web.">
|
||||
|
||||
<!-- LOCALIZATION NOTE (dontrememberActions.pre.label): include a trailing space as needed -->
|
||||
<!-- LOCALIZATION NOTE (dontrememberActions.post.label): include a starting space as needed -->
|
||||
<!ENTITY dontrememberActions.pre.label "You may also want to ">
|
||||
<!ENTITY dontrememberActions.clearHistory.label "clear all current history">
|
||||
<!ENTITY dontrememberActions.post.label ".">
|
||||
<!ENTITY clearHistoryButton.label "Clear History…">
|
||||
<!ENTITY clearHistoryButton.accesskey "s">
|
||||
|
||||
<!ENTITY privateBrowsingPermanent2.label "Always use private browsing mode">
|
||||
<!ENTITY privateBrowsingPermanent2.accesskey "p">
|
||||
|
|
|
@ -125,7 +125,7 @@ async function connectionDialog(aBrowser) {
|
|||
|
||||
async function clearRecentHistoryDialog(aBrowser) {
|
||||
await ContentTask.spawn(aBrowser, null, async function() {
|
||||
content.document.getElementById("historyRememberClear").click();
|
||||
content.document.getElementById("clearHistoryButton").click();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче