[Pkg-privacy-commits] [xul-ext-monkeysphere] 222/296: getting clearSite function working better.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository xul-ext-monkeysphere.

commit 49d4a8dff51ea2058cd26b66937a4e0dea9b7a87
Author: Jameson Rollins <jrollins at finestructure.net>
Date:   Sat May 1 14:44:14 2010 -0400

    getting clearSite function working better.
    
    This fixes the proper update of the status menu after the cache has
    been cleared, but it doesn't deal with the problem of the
    overrides.clear function not working properly.
---
 Changelog                      |  6 ++++++
 chrome/content/monkeysphere.js | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index aac5351..930a35c 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,9 @@
+xul-ext-monkeysphere (0.3~pre) unstable; urgency=low
+
+  * Fix clearSite status menu function **NOT FIXED YET**
+
+ -- Jameson Rollins <jrollins at finestructure.net>  Thu, 29 Apr 2010 12:39:57 -0400
+
 xul-ext-monkeysphere (0.2); urgency=low
 
   [ Daniel Kahn Gillmor ]
diff --git a/chrome/content/monkeysphere.js b/chrome/content/monkeysphere.js
index 7b8cf2f..4482118 100644
--- a/chrome/content/monkeysphere.js
+++ b/chrome/content/monkeysphere.js
@@ -166,6 +166,11 @@ var monkeysphere = (function() {
         panel.hidden = false;
         document.getElementById("monkeysphere-status-clearSite").hidden = false;
         break;
+      case 'CLEARED':
+        icon.setAttribute("src", "chrome://monkeysphere/content/good.png");
+        panel.hidden = false;
+        document.getElementById("monkeysphere-status-clearSite").hidden = true;
+        break;
       case 'NOTVALID':
         icon.setAttribute("src", "chrome://monkeysphere/content/bad.png");
         panel.hidden = false;
@@ -302,21 +307,24 @@ var monkeysphere = (function() {
     contextMenuFunctions: {
 
       clearSite: function() {
+        ms.log("context menu function: clearSite");
         var browser = gBrowser.selectedBrowser;
         var uri = browser.currentURI;
         try {
           var cert = browser.securityUI.SSLStatus.serverCert;
         } catch(e) {
-          ms.log("no valid cert found?");
+          ms.log("no valid cert found?  probably already cleared.");
           return;
         }
         var apd = ms.createAgentPostData(uri, cert);
+        apd.log();
         ms.overrides.clear(apd);
         // FIXME: why does the override seem to persist after a clear?
+        // this is a pretty big problem
         if(!ms.overrides.certStatus(apd)) {
-          alert('Monkeysphere: site clear error.  Is override cert cleared?');
+          alert('Monkeysphere error: override cert not cleared!');
         }
-        var newstate = browser.monkeysphere.state;
+        var newstate = "CLEARED";
         var newmessage = browser.monkeysphere.message + ' [NO LONGER CACHED]';
         ms.setStatus(browser, newstate, newmessage);
         updateDisplay();
@@ -327,6 +335,7 @@ var monkeysphere = (function() {
       },
 
       help: function() {
+        ms.log("context menu function: help");
         gBrowser.loadOneTab("chrome://monkeysphere/locale/help.html",
         null, null, null, false);
       }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/xul-ext-monkeysphere.git