From d5fa2fddcc6a2dfd59f65a3f2c1e9bf2d45626cf Mon Sep 17 00:00:00 2001 From: "morse%netscape.com" Date: Wed, 1 Aug 2001 02:45:30 +0000 Subject: [PATCH] bug 92386, remove-all-sites button is active when it shouldn't be, r=vishy, sr=blake git-svn-id: svn://10.0.0.236/trunk@100076 18797224-902f-48f8-a5cc-f745e15eee43 --- .../extensions/wallet/cookieviewer/CookieViewer.js | 13 +++++++------ .../extensions/wallet/signonviewer/SignonViewer.js | 8 ++++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/mozilla/extensions/wallet/cookieviewer/CookieViewer.js b/mozilla/extensions/wallet/cookieviewer/CookieViewer.js index 9754d138f4e..73d2cdbb034 100644 --- a/mozilla/extensions/wallet/cookieviewer/CookieViewer.js +++ b/mozilla/extensions/wallet/cookieviewer/CookieViewer.js @@ -369,18 +369,19 @@ function loadPermissions() contentStr = bundle.GetStringFromName(capability ? "can" : "cannot"); AddPermissionToList(cookie_permissions_count, host, type, capability); AddItem("cookiePermList", [host, contentStr], "cookiepermtree_", cookie_permissions_count++); - if (cookie_permissions_count == 0) { - document.getElementById("removeAllPermissions").setAttribute("disabled","true"); - } } else if (type == imageType) { contentStr = bundle.GetStringFromName(capability ? "canImages" : "cannotImages"); AddPermissionToList(image_permissions_count, host, type, capability); AddItem("imagePermList", [host, contentStr], "imagepermtree_", image_permissions_count++); - if (image_permissions_count == 0) { - document.getElementById("removeAllImages").setAttribute("disabled","true"); - } } } + if (cookie_permissions_count == 0) { + document.getElementById("removeAllPermissions").setAttribute("disabled","true"); + } + if (image_permissions_count == 0) { + document.getElementById("removeAllImages").setAttribute("disabled","true"); + } + } function ViewCookiePermissionSelected() diff --git a/mozilla/extensions/wallet/signonviewer/SignonViewer.js b/mozilla/extensions/wallet/signonviewer/SignonViewer.js index 6e056c168fb..c11ea016f3e 100644 --- a/mozilla/extensions/wallet/signonviewer/SignonViewer.js +++ b/mozilla/extensions/wallet/signonviewer/SignonViewer.js @@ -302,7 +302,9 @@ function LoadNopreview() currSignon = RemoveHTMLFormatting(currSignon); AddItem("nopreviewlist",[currSignon],"nopreview_",i-1); } - nopreviews_count = nopreviewList.length-1; + if (nopreviewList) { + nopreviews_count = nopreviewList.length-1; // -1 because first item is always blank + } if (nopreviews_count == 0) { document.getElementById("removeAllNopreviews").setAttribute("disabled","true"); } @@ -355,7 +357,9 @@ function LoadNocapture() currSignon = RemoveHTMLFormatting(currSignon); AddItem("nocapturelist",[currSignon],"nocapture_",i-1); } - nocaptures_count = nocaptureList.length-1; + if (nocaptureList) { + nocaptures_count = nocaptureList.length-1; // -1 because first item is always blank + } if (nocaptures_count == 0) { document.getElementById("removeAllNocaptures").setAttribute("disabled","true"); }