зеркало из https://github.com/mozilla/pjs.git
Bug 324063: "passwords never saved" is too hard to find, so move it into it's own window, r=mconnor, ui-r=beltzner
This commit is contained in:
Родитель
dcaeb9d028
Коммит
c522e4bbfd
|
@ -178,6 +178,12 @@ var gPrivacyPane = {
|
|||
"chrome://passwordmgr/content/passwordManager.xul",
|
||||
"", null);
|
||||
},
|
||||
viewPasswordExceptions: function (aCategory)
|
||||
{
|
||||
document.documentElement.openWindow("Toolkit:PasswordManagerExceptions",
|
||||
"chrome://passwordmgr/content/passwordManagerExceptions.xul",
|
||||
"", null);
|
||||
},
|
||||
|
||||
viewCookieExceptions: function ()
|
||||
{
|
||||
|
|
|
@ -84,6 +84,9 @@
|
|||
<preference id="pref.privacy.disable_button.view_passwords"
|
||||
name="pref.privacy.disable_button.view_passwords"
|
||||
type="bool"/>
|
||||
<preference id="pref.privacy.disable_button.view_passwords_exceptions"
|
||||
name="pref.privacy.disable_button.view_passwords_exceptions"
|
||||
type="bool"/>
|
||||
<preference id="pref.privacy.disable_button.set_master_password"
|
||||
name="pref.privacy.disable_button.set_master_password"
|
||||
type="bool"/>
|
||||
|
@ -147,6 +150,10 @@
|
|||
<checkbox id="savePasswords"
|
||||
label="&enablePasswords.label;" accesskey="&enablePasswords.accesskey;"
|
||||
preference="signon.rememberSignons"/>
|
||||
<button label="&exceptions.label;"
|
||||
accesskey="&viewPasswordExceptions.accesskey;"
|
||||
oncommand="gPrivacyPane.viewPasswordExceptions();"
|
||||
preference="pref.privacy.disable_button.view_passwords_exceptions"/>
|
||||
</hbox>
|
||||
<separator/>
|
||||
<hbox align="start">
|
||||
|
@ -171,7 +178,7 @@
|
|||
</hbox>
|
||||
</tabpanel>
|
||||
<tabpanel orient="vertical">
|
||||
<description control="viewDownloads" >&downloadManager.intro;</description>
|
||||
<description control="viewDownloads">&downloadManager.intro;</description>
|
||||
<separator class="thin"/>
|
||||
<hbox align="center">
|
||||
<label accesskey="&downloadsRetentionPolicy.accesskey;"
|
||||
|
|
|
@ -30,6 +30,10 @@
|
|||
<!ENTITY removeMasterPassword.accesskey "R">
|
||||
<!ENTITY viewPasswords.label "View Saved Passwords">
|
||||
<!ENTITY viewPasswords.accesskey "V">
|
||||
<!-- This accesskey is used with exceptions.label, defined below. -->
|
||||
<!ENTITY viewPasswordExceptions.accesskey
|
||||
"i">
|
||||
|
||||
|
||||
<!ENTITY itemDownloads.label "Download History">
|
||||
<!ENTITY downloadManager.intro "The Downloads window keeps track of recently downloaded files.">
|
||||
|
|
|
@ -39,100 +39,16 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
/*** =================== INITIALISATION CODE =================== ***/
|
||||
|
||||
var kObserverService;
|
||||
var kSignonBundle;
|
||||
var gSelectUserInUse = false;
|
||||
|
||||
// interface variables
|
||||
var passwordmanager = null;
|
||||
|
||||
// password-manager lists
|
||||
var signons = [];
|
||||
var rejects = [];
|
||||
var deletedSignons = [];
|
||||
var deletedRejects = [];
|
||||
|
||||
var showingPasswords = false;
|
||||
|
||||
function Startup() {
|
||||
// xpconnect to password manager interfaces
|
||||
passwordmanager = Components.classes["@mozilla.org/passwordmanager;1"].getService(Components.interfaces.nsIPasswordManager);
|
||||
|
||||
kSignonBundle = document.getElementById("signonBundle");
|
||||
|
||||
// be prepared to reload the display if anything changes
|
||||
kObserverService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
|
||||
kObserverService.addObserver(signonReloadDisplay, "signonChanged", false);
|
||||
|
||||
// be prepared to disable the buttons when selectuser dialog is in use
|
||||
kObserverService.addObserver(signonReloadDisplay, "signonSelectUser", false);
|
||||
|
||||
signonsTree = document.getElementById("signonsTree");
|
||||
rejectsTree = document.getElementById("rejectsTree");
|
||||
|
||||
// set initial password-manager tab
|
||||
var tabBox = document.getElementById("tabbox");
|
||||
tabBox.selectedTab = document.getElementById("signonsTab");
|
||||
|
||||
// label the show/hide password button and the close button
|
||||
document.getElementById("togglePasswords").label = kSignonBundle.getString(showingPasswords ? "hidePasswords" : "showPasswords");
|
||||
document.documentElement.getButton("accept").label = kSignonBundle.getString("close");
|
||||
|
||||
// load password manager items
|
||||
if (!LoadSignons()) {
|
||||
return; /* user failed to unlock the database */
|
||||
}
|
||||
LoadRejects();
|
||||
}
|
||||
|
||||
function Shutdown() {
|
||||
kObserverService.removeObserver(signonReloadDisplay, "signonChanged");
|
||||
kObserverService.removeObserver(signonReloadDisplay, "signonSelectUser");
|
||||
}
|
||||
|
||||
var signonReloadDisplay = {
|
||||
observe: function(subject, topic, state) {
|
||||
if (topic == "signonChanged") {
|
||||
if (state == "signons") {
|
||||
signons.length = 0;
|
||||
if (lastSignonSortColumn == "host") {
|
||||
lastSignonSortAscending = !lastSignonSortAscending; // prevents sort from being reversed
|
||||
}
|
||||
LoadSignons();
|
||||
} else if (state == "rejects") {
|
||||
rejects.length = 0;
|
||||
if (lastRejectSortColumn == "host") {
|
||||
lastRejectSortAscending = !lastRejectSortAscending; // prevents sort from being reversed
|
||||
}
|
||||
LoadRejects();
|
||||
}
|
||||
} else if (topic == "signonSelectUser") {
|
||||
if (state == "suspend") {
|
||||
gSelectUserInUse = true;
|
||||
document.getElementById("removeSignon").disabled = true;
|
||||
document.getElementById("removeAllSignons").disabled = true;
|
||||
document.getElementById("togglePasswords").disabled = true;
|
||||
} else if (state == "resume") {
|
||||
gSelectUserInUse = false;
|
||||
var selections = GetTreeSelections(signonsTree);
|
||||
if (selections.length > 0) {
|
||||
document.getElementById("removeSignon").disabled = false;
|
||||
}
|
||||
if (signons.length > 0) {
|
||||
document.getElementById("removeAllSignons").disabled = false;
|
||||
document.getElementById("togglePasswords").disabled = false;
|
||||
}
|
||||
} else if (state == "inUse") {
|
||||
gSelectUserInUse = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*** =================== SAVED SIGNONS CODE =================== ***/
|
||||
|
||||
var kSignonBundle;
|
||||
|
||||
function SignonsStartup() {
|
||||
kSignonBundle = document.getElementById("signonBundle");
|
||||
document.getElementById("togglePasswords").label = kSignonBundle.getString("showPasswords");
|
||||
LoadSignons();
|
||||
}
|
||||
|
||||
var signonsTreeView = {
|
||||
rowCount : 0,
|
||||
setTree : function(tree) {},
|
||||
|
@ -158,7 +74,6 @@ var signonsTreeView = {
|
|||
getColumnProperties : function(column,prop) {},
|
||||
getCellProperties : function(row,column,prop) {}
|
||||
};
|
||||
var signonsTree;
|
||||
|
||||
function Signon(number, host, user, rawuser, password) {
|
||||
this.number = number;
|
||||
|
@ -320,281 +235,3 @@ function SignonColumnSort(column) {
|
|||
column, lastSignonSortColumn, lastSignonSortAscending);
|
||||
lastSignonSortColumn = column;
|
||||
}
|
||||
|
||||
/*** =================== REJECTED SIGNONS CODE =================== ***/
|
||||
|
||||
var rejectsTreeView = {
|
||||
rowCount : 0,
|
||||
setTree : function(tree){},
|
||||
getImageSrc : function(row,column) {},
|
||||
getProgressMode : function(row,column) {},
|
||||
getCellValue : function(row,column) {},
|
||||
getCellText : function(row,column){
|
||||
var rv="";
|
||||
if (column.id=="rejectCol") {
|
||||
rv = rejects[row].host;
|
||||
}
|
||||
return rv;
|
||||
},
|
||||
isSeparator : function(index) {return false;},
|
||||
isSorted: function() { return false; },
|
||||
isContainer : function(index) {return false;},
|
||||
cycleHeader : function(column) {},
|
||||
getRowProperties : function(row,prop){},
|
||||
getColumnProperties : function(column,prop){},
|
||||
getCellProperties : function(row,column,prop){}
|
||||
};
|
||||
var rejectsTree;
|
||||
|
||||
function Reject(number, host) {
|
||||
this.number = number;
|
||||
this.host = host;
|
||||
}
|
||||
|
||||
function LoadRejects() {
|
||||
var enumerator = passwordmanager.rejectEnumerator;
|
||||
var count = 0;
|
||||
while (enumerator.hasMoreElements()) {
|
||||
var nextReject = enumerator.getNext();
|
||||
nextReject = nextReject.QueryInterface(Components.interfaces.nsIPassword);
|
||||
var host = nextReject.host;
|
||||
rejects[count] = new Reject(count++, host);
|
||||
}
|
||||
rejectsTreeView.rowCount = rejects.length;
|
||||
|
||||
// sort and display the table
|
||||
rejectsTree.treeBoxObject.view = rejectsTreeView;
|
||||
RejectColumnSort('host');
|
||||
|
||||
var element = document.getElementById("removeAllRejects");
|
||||
if (rejects.length == 0) {
|
||||
element.setAttribute("disabled","true");
|
||||
} else {
|
||||
element.removeAttribute("disabled");
|
||||
}
|
||||
}
|
||||
|
||||
function RejectSelected() {
|
||||
var selections = GetTreeSelections(rejectsTree);
|
||||
if (selections.length) {
|
||||
document.getElementById("removeReject").removeAttribute("disabled");
|
||||
}
|
||||
}
|
||||
|
||||
function DeleteReject() {
|
||||
DeleteSelectedItemFromTree(rejectsTree, rejectsTreeView,
|
||||
rejects, deletedRejects,
|
||||
"removeReject", "removeAllRejects");
|
||||
FinalizeRejectDeletions();
|
||||
}
|
||||
|
||||
function DeleteAllRejects() {
|
||||
DeleteAllFromTree(rejectsTree, rejectsTreeView,
|
||||
rejects, deletedRejects,
|
||||
"removeReject", "removeAllRejects");
|
||||
FinalizeRejectDeletions();
|
||||
}
|
||||
|
||||
function FinalizeRejectDeletions() {
|
||||
for (var r=0; r<deletedRejects.length; r++) {
|
||||
passwordmanager.removeReject(deletedRejects[r].host);
|
||||
}
|
||||
deletedRejects.length = 0;
|
||||
}
|
||||
|
||||
function HandleRejectKeyPress(e) {
|
||||
if (e.keyCode == 46) {
|
||||
DeleteRejectSelected();
|
||||
}
|
||||
}
|
||||
|
||||
var lastRejectSortColumn = "";
|
||||
var lastRejectSortAscending = false;
|
||||
|
||||
function RejectColumnSort(column) {
|
||||
lastRejectSortAscending =
|
||||
SortTree(rejectsTree, rejectsTreeView, rejects,
|
||||
column, lastRejectSortColumn, lastRejectSortAscending);
|
||||
lastRejectSortColumn = column;
|
||||
}
|
||||
|
||||
/*** =================== GENERAL CODE =================== ***/
|
||||
|
||||
// Remove whitespace from both ends of a string
|
||||
function TrimString(string)
|
||||
{
|
||||
if (!string) {
|
||||
return "";
|
||||
}
|
||||
return string.replace(/(^\s+)|(\s+$)/g, '')
|
||||
}
|
||||
|
||||
function DeleteAllFromTree
|
||||
(tree, view, table, deletedTable, removeButton, removeAllButton) {
|
||||
|
||||
// remove all items from table and place in deleted table
|
||||
for (var i=0; i<table.length; i++) {
|
||||
deletedTable[deletedTable.length] = table[i];
|
||||
}
|
||||
table.length = 0;
|
||||
|
||||
// clear out selections
|
||||
view.selection.select(-1);
|
||||
|
||||
// update the tree view and notify the tree
|
||||
view.rowCount = 0;
|
||||
|
||||
var box = tree.treeBoxObject;
|
||||
box.rowCountChanged(0, -deletedTable.length);
|
||||
box.invalidate();
|
||||
|
||||
|
||||
// disable buttons
|
||||
document.getElementById(removeButton).setAttribute("disabled", "true")
|
||||
document.getElementById(removeAllButton).setAttribute("disabled","true");
|
||||
}
|
||||
|
||||
function DeleteSelectedItemFromTree
|
||||
(tree, view, table, deletedTable, removeButton, removeAllButton) {
|
||||
|
||||
var box = tree.treeBoxObject;
|
||||
|
||||
// Remove selected items from list (by setting them to null) and place in
|
||||
// deleted list. At the same time, notify the tree of the row count changes.
|
||||
|
||||
var selection = box.view.selection;
|
||||
var oldSelectStart = table.length;
|
||||
box.beginUpdateBatch();
|
||||
|
||||
var selCount = selection.getRangeCount();
|
||||
var min = new Object();
|
||||
var max = new Object();
|
||||
|
||||
for (var s = 0; s < selCount; ++s) {
|
||||
selection.getRangeAt(s, min, max);
|
||||
var minVal = min.value;
|
||||
var maxVal = max.value;
|
||||
|
||||
oldSelectStart = minVal < oldSelectStart ? minVal : oldSelectStart;
|
||||
|
||||
var rowCount = maxVal - minVal + 1;
|
||||
view.rowCount -= rowCount;
|
||||
box.rowCountChanged(minVal, -rowCount);
|
||||
|
||||
for (var i = minVal; i <= maxVal; ++i) {
|
||||
deletedTable[deletedTable.length] = table[i];
|
||||
table[i] = null;
|
||||
}
|
||||
}
|
||||
|
||||
// collapse list by removing all the null entries
|
||||
for (var j = 0; j < table.length; ++j) {
|
||||
if (!table[j]) {
|
||||
var k = j;
|
||||
while (k < table.length && !table[k])
|
||||
k++;
|
||||
|
||||
table.splice(j, k-j);
|
||||
}
|
||||
}
|
||||
|
||||
box.endUpdateBatch();
|
||||
|
||||
// update selection and/or buttons
|
||||
var removeBtn = document.getElementById(removeButton);
|
||||
var removeAllBtn = document.getElementById(removeAllButton);
|
||||
|
||||
if (table.length) {
|
||||
removeBtn.removeAttribute("disabled");
|
||||
removeAllBtn.removeAttribute("disabled");
|
||||
|
||||
selection.select(oldSelectStart < table.length ? oldSelectStart : table.length - 1);
|
||||
} else {
|
||||
removeBtn.setAttribute("disabled", "true");
|
||||
removeAllBtn.setAttribute("disabled", "true");
|
||||
}
|
||||
}
|
||||
|
||||
function GetTreeSelections(tree) {
|
||||
var selections = [];
|
||||
var select = tree.view.selection;
|
||||
if (select) {
|
||||
var count = select.getRangeCount();
|
||||
var min = new Object();
|
||||
var max = new Object();
|
||||
for (var i=0; i<count; i++) {
|
||||
select.getRangeAt(i, min, max);
|
||||
for (var k=min.value; k<=max.value; k++) {
|
||||
if (k != -1) {
|
||||
selections[selections.length] = k;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return selections;
|
||||
}
|
||||
|
||||
function SortTree(tree, view, table, column, lastSortColumn, lastSortAscending, updateSelection) {
|
||||
|
||||
// remember which item was selected so we can restore it after the sort
|
||||
var selections = GetTreeSelections(tree);
|
||||
var selectedNumber = selections.length ? table[selections[0]].number : -1;
|
||||
|
||||
// determine if sort is to be ascending or descending
|
||||
var ascending = (column == lastSortColumn) ? !lastSortAscending : true;
|
||||
|
||||
// do the sort
|
||||
var compareFunc;
|
||||
if (ascending) {
|
||||
compareFunc = function compare(first, second) {
|
||||
return CompareLowerCase(first[column], second[column]);
|
||||
}
|
||||
} else {
|
||||
compareFunc = function compare(first, second) {
|
||||
return CompareLowerCase(second[column], first[column]);
|
||||
}
|
||||
}
|
||||
table.sort(compareFunc);
|
||||
|
||||
// restore the selection
|
||||
var selectedRow = -1;
|
||||
if (selectedNumber>=0 && updateSelection) {
|
||||
for (var s=0; s<table.length; s++) {
|
||||
if (table[s].number == selectedNumber) {
|
||||
// update selection
|
||||
// note: we need to deselect before reselecting in order to trigger ...Selected()
|
||||
tree.view.selection.select(-1);
|
||||
tree.view.selection.select(s);
|
||||
selectedRow = s;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// display the results
|
||||
tree.treeBoxObject.invalidate();
|
||||
if (selectedRow >= 0) {
|
||||
tree.treeBoxObject.ensureRowIsVisible(selectedRow)
|
||||
}
|
||||
|
||||
return ascending;
|
||||
}
|
||||
|
||||
/**
|
||||
* Case insensitive string comparator.
|
||||
*/
|
||||
function CompareLowerCase(first, second) {
|
||||
|
||||
var firstLower = first.toLowerCase();
|
||||
var secondLower = second.toLowerCase();
|
||||
|
||||
if (firstLower < secondLower) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (firstLower > secondLower) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -42,83 +42,55 @@
|
|||
|
||||
<!DOCTYPE dialog SYSTEM "chrome://passwordmgr/locale/passwordManager.dtd" >
|
||||
|
||||
<prefwindow id="SignonViewerDialog" windowtype="Toolkit:PasswordManager"
|
||||
<prefwindow id="SignonViewerExceptionDialog"
|
||||
windowtype="Toolkit:PasswordManagerExceptions"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
buttons="accept"
|
||||
onload="Startup();" onunload="Shutdown();"
|
||||
title="&windowtitle.label;"
|
||||
buttonlabelaccept="&closebutton.label;"
|
||||
onload="Startup(); SignonsStartup();"
|
||||
onunload="Shutdown();"
|
||||
title="&rememberPasswords.title;"
|
||||
persist="width height screenX screenY">
|
||||
|
||||
<prefpane id="SignonViewerDialogPane" flex="1">
|
||||
<script src="chrome://passwordmgr/content/passwordManagerCommon.js"/>
|
||||
<script src="chrome://passwordmgr/content/passwordManager.js"/>
|
||||
|
||||
<stringbundle id="signonBundle"
|
||||
src="chrome://passwordmgr/locale/passwordmgr.properties"/>
|
||||
|
||||
<tabbox id="tabbox" flex="1">
|
||||
<tabs>
|
||||
<tab id="signonsTab" label="&tab.signonsstored.label;"/>
|
||||
<tab id="signonsitesTab" label="&tab.signonsnotstored.label;"/>
|
||||
</tabs>
|
||||
<tabpanels id="panel" flex="1">
|
||||
<!-- saved signons -->
|
||||
<vbox id="savedsignons" flex="1">
|
||||
<description control="signonsTree">&spiel.signonsstored.label;</description>
|
||||
<separator class="thin"/>
|
||||
<tree id="signonsTree" flex="1" style="height: 20em;" hidecolumnpicker="true"
|
||||
onkeypress="HandleSignonKeyPress(event)"
|
||||
onselect="SignonSelected();">
|
||||
<treecols>
|
||||
<treecol id="siteCol" label="&treehead.site.label;" flex="5"
|
||||
onclick="SignonColumnSort('host');" persist="width"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="userCol" label="&treehead.username.label;" flex="2"
|
||||
onclick="SignonColumnSort('user');" persist="width"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="passwordCol" label="&treehead.password.label;" flex="2"
|
||||
onclick="SignonColumnSort('password');" persist="width"
|
||||
hidden="true"/>
|
||||
</treecols>
|
||||
<treechildren/>
|
||||
</tree>
|
||||
<separator class="thin"/>
|
||||
<hbox>
|
||||
<button id="removeSignon" disabled="true" icon="remove"
|
||||
label="&remove.label;" accesskey="&remove.accesskey;"
|
||||
oncommand="DeleteSignon();"/>
|
||||
<button id="removeAllSignons" icon="clear"
|
||||
label="&removeall.label;" accesskey="&removeall.accesskey;"
|
||||
oncommand="DeleteAllSignons();"/>
|
||||
<spacer flex="1"/>
|
||||
<button id="togglePasswords"
|
||||
oncommand="TogglePasswordVisible();"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
<!-- rejected signon sites -->
|
||||
<vbox id="rejectedsites" flex="1">
|
||||
<description control="rejectsTree">&spiel.signonsnotstored.label;</description>
|
||||
<separator class="thin"/>
|
||||
<tree id="rejectsTree" flex="1" style="height: 10em;" hidecolumnpicker="true"
|
||||
onkeypress="HandleRejectKeyPress(event)"
|
||||
onselect="RejectSelected();">
|
||||
<treecols>
|
||||
<treecol id="rejectCol" label="&treehead.site.label;" flex="5"
|
||||
onclick="RejectColumnSort('host');"/>
|
||||
</treecols>
|
||||
<treechildren/>
|
||||
</tree>
|
||||
<separator class="thin"/>
|
||||
<hbox>
|
||||
<button id="removeReject" disabled="true" icon="remove"
|
||||
accesskey="&remove.accesskey;"
|
||||
label="&remove.label;" oncommand="DeleteReject();"/>
|
||||
<button id="removeAllRejects"
|
||||
accesskey="&removeall.accesskey;"
|
||||
icon="clear" label="&removeall.label;"
|
||||
oncommand="DeleteAllRejects();"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</tabpanels>
|
||||
</tabbox>
|
||||
<!-- saved signons -->
|
||||
<vbox id="savedsignons" flex="1">
|
||||
<description control="signonsTree">&spiel.signonsstored.label;</description>
|
||||
<separator class="thin"/>
|
||||
<tree id="signonsTree" flex="1" style="height: 20em;" hidecolumnpicker="true"
|
||||
onkeypress="HandleSignonKeyPress(event)"
|
||||
onselect="SignonSelected();">
|
||||
<treecols>
|
||||
<treecol id="siteCol" label="&treehead.site.label;" flex="5"
|
||||
onclick="SignonColumnSort('host');" persist="width"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="userCol" label="&treehead.username.label;" flex="2"
|
||||
onclick="SignonColumnSort('user');" persist="width"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="passwordCol" label="&treehead.password.label;" flex="2"
|
||||
onclick="SignonColumnSort('password');" persist="width"
|
||||
hidden="true"/>
|
||||
</treecols>
|
||||
<treechildren/>
|
||||
</tree>
|
||||
<separator class="thin"/>
|
||||
<hbox>
|
||||
<button id="removeSignon" disabled="true" icon="remove"
|
||||
label="&remove.label;" accesskey="&remove.accesskey;"
|
||||
oncommand="DeleteSignon();"/>
|
||||
<button id="removeAllSignons" icon="clear"
|
||||
label="&removeall.label;" accesskey="&removeall.accesskey;"
|
||||
oncommand="DeleteAllSignons();"/>
|
||||
<spacer flex="1"/>
|
||||
<button id="togglePasswords"
|
||||
oncommand="TogglePasswordVisible();"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</prefpane>
|
||||
</prefwindow>
|
||||
|
|
|
@ -0,0 +1,289 @@
|
|||
# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is Mozilla Communicator client code, released
|
||||
# March 31, 1998.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1998
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Ben "Count XULula" Goodger
|
||||
# Brian Ryner <bryner@brianryner.com>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
/*** =================== INITIALISATION CODE =================== ***/
|
||||
|
||||
var kObserverService;
|
||||
var gSelectUserInUse = false;
|
||||
|
||||
// interface variables
|
||||
var passwordmanager = null;
|
||||
|
||||
// password-manager lists
|
||||
var signons = [];
|
||||
var rejects = [];
|
||||
var deletedSignons = [];
|
||||
var deletedRejects = [];
|
||||
|
||||
var signonsTree;
|
||||
var rejectsTree;
|
||||
|
||||
var showingPasswords = false;
|
||||
|
||||
function Startup() {
|
||||
// xpconnect to password manager interfaces
|
||||
passwordmanager = Components.classes["@mozilla.org/passwordmanager;1"].getService(Components.interfaces.nsIPasswordManager);
|
||||
|
||||
// be prepared to reload the display if anything changes
|
||||
kObserverService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
|
||||
kObserverService.addObserver(signonReloadDisplay, "signonChanged", false);
|
||||
|
||||
// be prepared to disable the buttons when selectuser dialog is in use
|
||||
kObserverService.addObserver(signonReloadDisplay, "signonSelectUser", false);
|
||||
|
||||
signonsTree = document.getElementById("signonsTree");
|
||||
rejectsTree = document.getElementById("rejectsTree");
|
||||
}
|
||||
|
||||
function Shutdown() {
|
||||
kObserverService.removeObserver(signonReloadDisplay, "signonChanged");
|
||||
kObserverService.removeObserver(signonReloadDisplay, "signonSelectUser");
|
||||
}
|
||||
|
||||
var signonReloadDisplay = {
|
||||
observe: function(subject, topic, state) {
|
||||
if (topic == "signonChanged") {
|
||||
if (state == "signons") {
|
||||
signons.length = 0;
|
||||
if (lastSignonSortColumn == "host") {
|
||||
lastSignonSortAscending = !lastSignonSortAscending; // prevents sort from being reversed
|
||||
}
|
||||
LoadSignons();
|
||||
} else if (state == "rejects") {
|
||||
rejects.length = 0;
|
||||
if (lastRejectSortColumn == "host") {
|
||||
lastRejectSortAscending = !lastRejectSortAscending; // prevents sort from being reversed
|
||||
}
|
||||
LoadRejects();
|
||||
}
|
||||
} else if (topic == "signonSelectUser") {
|
||||
if (state == "suspend") {
|
||||
gSelectUserInUse = true;
|
||||
document.getElementById("removeSignon").disabled = true;
|
||||
document.getElementById("removeAllSignons").disabled = true;
|
||||
document.getElementById("togglePasswords").disabled = true;
|
||||
} else if (state == "resume") {
|
||||
gSelectUserInUse = false;
|
||||
var selections = GetTreeSelections(signonsTree);
|
||||
if (selections.length > 0) {
|
||||
document.getElementById("removeSignon").disabled = false;
|
||||
}
|
||||
if (signons.length > 0) {
|
||||
document.getElementById("removeAllSignons").disabled = false;
|
||||
document.getElementById("togglePasswords").disabled = false;
|
||||
}
|
||||
} else if (state == "inUse") {
|
||||
gSelectUserInUse = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*** =================== GENERAL CODE =================== ***/
|
||||
|
||||
function DeleteAllFromTree(tree, view, table, deletedTable, removeButton, removeAllButton) {
|
||||
|
||||
// remove all items from table and place in deleted table
|
||||
for (var i=0; i<table.length; i++) {
|
||||
deletedTable[deletedTable.length] = table[i];
|
||||
}
|
||||
table.length = 0;
|
||||
|
||||
// clear out selections
|
||||
view.selection.select(-1);
|
||||
|
||||
// update the tree view and notify the tree
|
||||
view.rowCount = 0;
|
||||
|
||||
var box = tree.treeBoxObject;
|
||||
box.rowCountChanged(0, -deletedTable.length);
|
||||
box.invalidate();
|
||||
|
||||
|
||||
// disable buttons
|
||||
document.getElementById(removeButton).setAttribute("disabled", "true")
|
||||
document.getElementById(removeAllButton).setAttribute("disabled","true");
|
||||
}
|
||||
|
||||
function DeleteSelectedItemFromTree
|
||||
(tree, view, table, deletedTable, removeButton, removeAllButton) {
|
||||
|
||||
var box = tree.treeBoxObject;
|
||||
|
||||
// Remove selected items from list (by setting them to null) and place in
|
||||
// deleted list. At the same time, notify the tree of the row count changes.
|
||||
|
||||
var selection = box.view.selection;
|
||||
var oldSelectStart = table.length;
|
||||
box.beginUpdateBatch();
|
||||
|
||||
var selCount = selection.getRangeCount();
|
||||
var min = new Object();
|
||||
var max = new Object();
|
||||
|
||||
for (var s = 0; s < selCount; ++s) {
|
||||
selection.getRangeAt(s, min, max);
|
||||
var minVal = min.value;
|
||||
var maxVal = max.value;
|
||||
|
||||
oldSelectStart = minVal < oldSelectStart ? minVal : oldSelectStart;
|
||||
|
||||
var rowCount = maxVal - minVal + 1;
|
||||
view.rowCount -= rowCount;
|
||||
box.rowCountChanged(minVal, -rowCount);
|
||||
|
||||
for (var i = minVal; i <= maxVal; ++i) {
|
||||
deletedTable[deletedTable.length] = table[i];
|
||||
table[i] = null;
|
||||
}
|
||||
}
|
||||
|
||||
// collapse list by removing all the null entries
|
||||
for (var j = 0; j < table.length; ++j) {
|
||||
if (!table[j]) {
|
||||
var k = j;
|
||||
while (k < table.length && !table[k])
|
||||
k++;
|
||||
|
||||
table.splice(j, k-j);
|
||||
}
|
||||
}
|
||||
|
||||
box.endUpdateBatch();
|
||||
|
||||
// update selection and/or buttons
|
||||
var removeBtn = document.getElementById(removeButton);
|
||||
var removeAllBtn = document.getElementById(removeAllButton);
|
||||
|
||||
if (table.length) {
|
||||
removeBtn.removeAttribute("disabled");
|
||||
removeAllBtn.removeAttribute("disabled");
|
||||
|
||||
selection.select(oldSelectStart < table.length ? oldSelectStart : table.length - 1);
|
||||
} else {
|
||||
removeBtn.setAttribute("disabled", "true");
|
||||
removeAllBtn.setAttribute("disabled", "true");
|
||||
}
|
||||
}
|
||||
|
||||
function GetTreeSelections(tree) {
|
||||
var selections = [];
|
||||
var select = tree.view.selection;
|
||||
if (select) {
|
||||
var count = select.getRangeCount();
|
||||
var min = new Object();
|
||||
var max = new Object();
|
||||
for (var i=0; i<count; i++) {
|
||||
select.getRangeAt(i, min, max);
|
||||
for (var k=min.value; k<=max.value; k++) {
|
||||
if (k != -1) {
|
||||
selections[selections.length] = k;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return selections;
|
||||
}
|
||||
|
||||
function SortTree(tree, view, table, column, lastSortColumn, lastSortAscending, updateSelection) {
|
||||
|
||||
// remember which item was selected so we can restore it after the sort
|
||||
var selections = GetTreeSelections(tree);
|
||||
var selectedNumber = selections.length ? table[selections[0]].number : -1;
|
||||
|
||||
// determine if sort is to be ascending or descending
|
||||
var ascending = (column == lastSortColumn) ? !lastSortAscending : true;
|
||||
|
||||
// do the sort
|
||||
var compareFunc;
|
||||
if (ascending) {
|
||||
compareFunc = function compare(first, second) {
|
||||
return CompareLowerCase(first[column], second[column]);
|
||||
}
|
||||
} else {
|
||||
compareFunc = function compare(first, second) {
|
||||
return CompareLowerCase(second[column], first[column]);
|
||||
}
|
||||
}
|
||||
table.sort(compareFunc);
|
||||
|
||||
// restore the selection
|
||||
var selectedRow = -1;
|
||||
if (selectedNumber>=0 && updateSelection) {
|
||||
for (var s=0; s<table.length; s++) {
|
||||
if (table[s].number == selectedNumber) {
|
||||
// update selection
|
||||
// note: we need to deselect before reselecting in order to trigger ...Selected()
|
||||
tree.view.selection.select(-1);
|
||||
tree.view.selection.select(s);
|
||||
selectedRow = s;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// display the results
|
||||
tree.treeBoxObject.invalidate();
|
||||
if (selectedRow >= 0) {
|
||||
tree.treeBoxObject.ensureRowIsVisible(selectedRow)
|
||||
}
|
||||
|
||||
return ascending;
|
||||
}
|
||||
|
||||
/**
|
||||
* Case insensitive string comparator.
|
||||
*/
|
||||
function CompareLowerCase(first, second) {
|
||||
|
||||
var firstLower = first.toLowerCase();
|
||||
var secondLower = second.toLowerCase();
|
||||
|
||||
if (firstLower < secondLower) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (firstLower > secondLower) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
|
@ -1,4 +0,0 @@
|
|||
toolkit.jar:
|
||||
% content passwordmgr %content/passwordmgr/ xpcnativewrappers=yes
|
||||
* content/passwordmgr/passwordManager.xul (content/passwordManager.xul)
|
||||
* content/passwordmgr/passwordManager.js (content/passwordManager.js)
|
|
@ -37,7 +37,9 @@
|
|||
# ***** END LICENSE BLOCK *****
|
||||
-->
|
||||
|
||||
<!ENTITY windowtitle.label "Password Manager">
|
||||
<!ENTITY rememberPasswords.title "Remember Passwords">
|
||||
<!ENTITY dontRememberPasswords.title "Don't Remember Passwords">
|
||||
<!ENTITY closebutton.label "Close">
|
||||
<!ENTITY tab.signonsstored.label "Passwords Saved">
|
||||
<!ENTITY tab.signonsnotstored.label "Passwords Never Saved">
|
||||
|
||||
|
|
|
@ -42,7 +42,6 @@ savePasswordText = Do you want %S to remember this password?
|
|||
rememberButtonText = &Remember
|
||||
notNowButtonText = &Not Now
|
||||
neverForSiteButtonText = Ne&ver for This Site
|
||||
close = Close
|
||||
passwordChangeTitle = Confirm Password Change
|
||||
passwordChangeText = Would you like to have Password Manager change the stored password for %S?
|
||||
userSelectText = Please confirm which user you are changing the password for
|
||||
|
|
Загрузка…
Ссылка в новой задаче