зеркало из https://github.com/mozilla/gecko-dev.git
restoring changes that were accidentally backed out, r=dveditz
This commit is contained in:
Родитель
0adba87a3c
Коммит
f22db2162a
|
@ -235,13 +235,6 @@ function HideImage() {
|
||||||
element.setAttribute("disabled","true" );
|
element.setAttribute("disabled","true" );
|
||||||
}
|
}
|
||||||
|
|
||||||
function HideImage() {
|
|
||||||
var element;
|
|
||||||
element = document.getElementById("image");
|
|
||||||
element.setAttribute("style","display: none;" );
|
|
||||||
element.setAttribute("disabled","true" );
|
|
||||||
}
|
|
||||||
|
|
||||||
function HideEncryptOrObscure() {
|
function HideEncryptOrObscure() {
|
||||||
var elementOn, elementOff;
|
var elementOn, elementOff;
|
||||||
if (this.pref.GetBoolPref("wallet.crypto")) {
|
if (this.pref.GetBoolPref("wallet.crypto")) {
|
||||||
|
@ -260,6 +253,10 @@ function CheckForWalletAndImage()
|
||||||
// remove either encrypt or obscure depending on pref setting
|
// remove either encrypt or obscure depending on pref setting
|
||||||
HideEncryptOrObscure();
|
HideEncryptOrObscure();
|
||||||
|
|
||||||
|
// remove quickfill since it was just for development purposes
|
||||||
|
element = document.getElementById("walletQuickFill");
|
||||||
|
element.setAttribute("style","display: none;" );
|
||||||
|
|
||||||
// remove wallet functions if not in browser
|
// remove wallet functions if not in browser
|
||||||
try {
|
try {
|
||||||
if (!appCore) {
|
if (!appCore) {
|
||||||
|
@ -292,7 +289,7 @@ function CheckForWalletAndImage()
|
||||||
// perform a wallet action
|
// perform a wallet action
|
||||||
function WalletAction( action )
|
function WalletAction( action )
|
||||||
{
|
{
|
||||||
if (action == "password" || action == "expire") {
|
if (action == "password" || action == "expire" || action == "clear") {
|
||||||
wallet = Components.classes['component://netscape/wallet/wallet-service'];
|
wallet = Components.classes['component://netscape/wallet/wallet-service'];
|
||||||
wallet = wallet.getService();
|
wallet = wallet.getService();
|
||||||
wallet = wallet.QueryInterface(Components.interfaces.nsIWalletService);
|
wallet = wallet.QueryInterface(Components.interfaces.nsIWalletService);
|
||||||
|
@ -301,6 +298,8 @@ function WalletAction( action )
|
||||||
wallet.WALLET_ChangePassword();
|
wallet.WALLET_ChangePassword();
|
||||||
} else if (action == "expire") {
|
} else if (action == "expire") {
|
||||||
wallet.WALLET_ExpirePassword();
|
wallet.WALLET_ExpirePassword();
|
||||||
|
} else if (action == "clear") {
|
||||||
|
wallet.WALLET_DeleteAll();
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,6 +49,19 @@
|
||||||
oncommand="WalletAction('encrypt');"/>
|
oncommand="WalletAction('encrypt');"/>
|
||||||
<menuitem value="&walletObscureCmd.label;" id="obscure"
|
<menuitem value="&walletObscureCmd.label;" id="obscure"
|
||||||
oncommand="WalletAction('obscure');"/>
|
oncommand="WalletAction('obscure');"/>
|
||||||
|
<menuitem value="&walletClearCmd.label;" id="clear"
|
||||||
|
oncommand="WalletAction('clear');"/>
|
||||||
|
</menupopup>
|
||||||
|
</menu>
|
||||||
|
<menu value="&walletFormManager.label;" id="wallet">
|
||||||
|
<menupopup>
|
||||||
|
<menuitem id="walleteditor" value="&walletContentsCmd.label;" oncommand="WalletDialog('wallet');"/>
|
||||||
|
<menuitem value="&walletSafeFillCmd.label;" id="walletSafeFill" oncommand="WalletAction('safefill');"/>
|
||||||
|
<menuitem value="&walletQuickFillCmd.label;" id="walletQuickFill" oncommand="WalletAction('quickfill');"/>
|
||||||
|
<menuitem value="&walletRequestToCaptureCmd.label;" id="walletCapture" oncommand="WalletAction('capture');"/>
|
||||||
|
<menuseparator/>
|
||||||
|
<menuitem value="&walletInterviewCmd.label;" id="walletInterview" oncommand="WalletDialog('interview');"/>
|
||||||
|
<menuitem value="&walletSamplesCmd.label;" id="walletSamples" oncommand="WalletDialog('samples');"/>
|
||||||
</menupopup>
|
</menupopup>
|
||||||
</menu>
|
</menu>
|
||||||
<menu value="&walletCookieManager.label;">
|
<menu value="&walletCookieManager.label;">
|
||||||
|
@ -75,16 +88,6 @@
|
||||||
oncommand="WalletAction('imageBlock');"/>
|
oncommand="WalletAction('imageBlock');"/>
|
||||||
</menupopup>
|
</menupopup>
|
||||||
</menu>
|
</menu>
|
||||||
<menu value="&walletFormManager.label;" id="wallet">
|
|
||||||
<menupopup>
|
|
||||||
<menuitem id="walleteditor" value="&walletContentsCmd.label;" oncommand="WalletDialog('wallet');"/>
|
|
||||||
<menuitem value="&walletSafeFillCmd.label;" id="walletSafeFill" oncommand="WalletAction('safefill');"/>
|
|
||||||
<menuitem value="&walletQuickFillCmd.label;" id="walletQuickFill" oncommand="WalletAction('quickfill');"/>
|
|
||||||
<menuitem value="&walletRequestToCaptureCmd.label;" id="walletCapture" oncommand="WalletAction('capture');"/>
|
|
||||||
<menuitem value="&walletInterviewCmd.label;" id="walletInterview" oncommand="WalletDialog('interview');"/>
|
|
||||||
<menuitem value="&walletSamplesCmd.label;" id="walletSamples" oncommand="WalletDialog('samples');"/>
|
|
||||||
</menupopup>
|
|
||||||
</menu>
|
|
||||||
</menupopup>
|
</menupopup>
|
||||||
</menu>
|
</menu>
|
||||||
<menuseparator/>
|
<menuseparator/>
|
||||||
|
|
|
@ -20,11 +20,11 @@
|
||||||
<!ENTITY walletMenu.label "Privacy and Security">
|
<!ENTITY walletMenu.label "Privacy and Security">
|
||||||
<!ENTITY walletFormManager.label "Form Manager">
|
<!ENTITY walletFormManager.label "Form Manager">
|
||||||
<!ENTITY walletPasswordManager.label "Password Manager">
|
<!ENTITY walletPasswordManager.label "Password Manager">
|
||||||
<!ENTITY walletSafeFillCmd.label "Prefill Form Safely">
|
<!ENTITY walletSafeFillCmd.label "Prefill Form with Captured Data">
|
||||||
<!ENTITY walletQuickFillCmd.label "Prefill Form Quickly">
|
<!ENTITY walletQuickFillCmd.label "Prefill Form Quickly">
|
||||||
<!ENTITY walletRequestToCaptureCmd.label "Capture Data from Form">
|
<!ENTITY walletRequestToCaptureCmd.label "Capture Data found on Form">
|
||||||
<!-- LOCALIZATION NOTE (walletContentsCmd.label): Do NOT translate "Wallet"-->
|
<!-- LOCALIZATION NOTE (walletContentsCmd.label): Do NOT translate "Wallet"-->
|
||||||
<!ENTITY walletContentsCmd.label "View Stored Form Data">
|
<!ENTITY walletContentsCmd.label "View Captured Form Data">
|
||||||
<!ENTITY walletDisplaySignonsCmd.label "View Stored Passwords">
|
<!ENTITY walletDisplaySignonsCmd.label "View Stored Passwords">
|
||||||
<!ENTITY walletDisplayCookiesCmd.label "View Stored Cookies">
|
<!ENTITY walletDisplayCookiesCmd.label "View Stored Cookies">
|
||||||
<!ENTITY walletAllowCookiesCmd.label "Allow Site to Set Cookies">
|
<!ENTITY walletAllowCookiesCmd.label "Allow Site to Set Cookies">
|
||||||
|
@ -42,6 +42,7 @@
|
||||||
<!ENTITY walletExpirePasswordCmd.label "Log Out">
|
<!ENTITY walletExpirePasswordCmd.label "Log Out">
|
||||||
<!ENTITY walletEncryptCmd.label "Encrypt Stored Data">
|
<!ENTITY walletEncryptCmd.label "Encrypt Stored Data">
|
||||||
<!ENTITY walletObscureCmd.label "Obscure Stored Data">
|
<!ENTITY walletObscureCmd.label "Obscure Stored Data">
|
||||||
|
<!ENTITY walletClearCmd.label "Clear Stored Data">
|
||||||
<!ENTITY walletCookieManager.label "Cookie Manager">
|
<!ENTITY walletCookieManager.label "Cookie Manager">
|
||||||
<!ENTITY walletImageManager.label "Image Manager">
|
<!ENTITY walletImageManager.label "Image Manager">
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче