зеркало из https://github.com/mozilla/gecko-dev.git
Checking in for morse@netscape.combug# 87334, r=rangansen r=jag sr=Alect Flettenforcing ask everytime option for passwords ...
This commit is contained in:
Родитель
b5223e661f
Коммит
6c6805d401
|
@ -36,7 +36,7 @@
|
|||
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["signonRememberSignons", "encryptEnabled", "encryptExpire"];
|
||||
var _elementIDs = ["signonRememberSignons", "encryptEnabled"];
|
||||
]]>
|
||||
</script>
|
||||
|
||||
|
@ -63,23 +63,6 @@
|
|||
wallet.WALLET_InitReencryptCallback(window);
|
||||
}
|
||||
|
||||
function encryptionTest() {
|
||||
var checkbox = document.getElementById("encryptExpire");
|
||||
var checked = checkbox.getAttribute("checked");
|
||||
|
||||
var wallet = Components.classes['@mozilla.org/wallet/wallet-service;1'];
|
||||
wallet = wallet.getService();
|
||||
wallet = wallet.QueryInterface(Components.interfaces.nsIWalletService);
|
||||
try {
|
||||
wallet.WALLET_Encrypt("dummy");
|
||||
} catch (ex) {
|
||||
// user could not supply master password, leave checkbox in original state
|
||||
checkbox.setAttribute("checked", !checked);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
]]>
|
||||
</script>
|
||||
|
||||
|
@ -108,9 +91,6 @@
|
|||
<checkbox id="encryptEnabled" label="&encryptEnabled.label;" accesskey="&encryptEnabled.accesskey;"
|
||||
pref="true" preftype="bool" prefstring="wallet.crypto"
|
||||
prefattribute="checked" oncommand="initReencryptCallback();"/>
|
||||
<checkbox id="encryptExpire" label="&encryptExpire.label;" accesskey="&encryptExpire.accesskey;"
|
||||
pref="true" preftype="bool" prefstring="signon.expireMasterPassword"
|
||||
prefattribute="checked" oncommand="encryptionTest();"/>
|
||||
</vbox>
|
||||
|
||||
</groupbox>
|
||||
|
|
|
@ -93,6 +93,9 @@ function changePasswordSettings()
|
|||
break;
|
||||
}
|
||||
internal_token.setAskPasswordDefaults(askTimes, timeout);
|
||||
|
||||
var askEveryTimeHidden = document.getElementById("askEveryTimeHidden");
|
||||
askEveryTimeHidden.setAttribute("checked",(radiogroup.value == 1)?"true":"false");
|
||||
}
|
||||
|
||||
function ChangePW()
|
||||
|
|
|
@ -38,6 +38,17 @@
|
|||
|
||||
<script type="application/x-javascript" src="chrome://pippki/content/pref-masterpass.js"/>
|
||||
|
||||
<!-- List elements to manage for prefs -->
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["askEveryTimeHidden",
|
||||
"changePasswordButton",
|
||||
"resetPasswordButton",
|
||||
"passwordAskTimes",
|
||||
"passwordTimeout"];
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<!-- Fancy panel header -->
|
||||
<hbox class="box-smallheader" title="&lheader;"/>
|
||||
|
||||
|
@ -56,6 +67,11 @@
|
|||
|
||||
<!-- Password Prefs -->
|
||||
<groupbox orient="vertical">
|
||||
|
||||
<checkbox id="askEveryTimeHidden"
|
||||
pref="true" preftype="bool" prefstring="signon.expireMasterPassword"
|
||||
prefattribute="checked" hidden="true"/>
|
||||
|
||||
<caption label="&managepassword.label;"/>
|
||||
<html>&managepassword.text;</html>
|
||||
<hbox autostretch="never">
|
||||
|
|
Загрузка…
Ссылка в новой задаче