[Pkg-privacy-commits] [xul-ext-monkeysphere] 124/296: fix updateDisplay to get the current browser itself and display status from that also update some log messages

[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 adc8a225292d5c4c7ed9f88a691f171769e71964
Author: Jameson Rollins <jrollins at finestructure.net>
Date:   Sat Mar 6 15:21:31 2010 -0500

    fix updateDisplay to get the current browser itself and display status from that
    also update some log messages
---
 chrome/content/monkeysphere.js | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/chrome/content/monkeysphere.js b/chrome/content/monkeysphere.js
index 3e22159..d5849a6 100644
--- a/chrome/content/monkeysphere.js
+++ b/chrome/content/monkeysphere.js
@@ -111,7 +111,7 @@ var monkeysphere = {
   progressListener: {
     onLocationChange: function(aWebProgress, aRequest, aLocation) {
       monkeysphere.log("++++ PL location change: " + aLocation.prePath);
-      monkeysphere.updateDisplay(gBrowser.selectedBrowser);
+      monkeysphere.updateDisplay();
     },
 
     onProgressChange: function() {},
@@ -252,18 +252,22 @@ var monkeysphere = {
     if ( typeof message === 'undefined' ) {
       message = monkeysphere.getDefaultStatusText(state);
     }
+    monkeysphere.log("setStatus: " + state + ', ' + message);
     browser.monkeysphere = { state: state, message: message };
   },
 
   //////////////////////////////////////////////////////////
   // set the status
-  updateDisplay: function(browser) {
+  updateDisplay: function() {
+    var browser = gBrowser.selectedBrowser;
     var panel = document.getElementById("monkeysphere-status");
     var icon = document.getElementById("monkeysphere-status-image");
 
+    monkeysphere.log("updateDisplay:");
+
     // the following happens when called from a dialog
     if(!panel || !icon) {
-      monkeysphere.log("setStatus: falling back to window.opener");
+      monkeysphere.log("updateDisplay: falling back to window.opener");
       panel = window.opener.document.getElementById("monkeysphere-status");
       icon = window.opener.document.getElementById("monkeysphere-status-image");
     }
@@ -278,33 +282,33 @@ var monkeysphere = {
 
     switch(state){
       case monkeysphere.states.INPROGRESS:
-        monkeysphere.log("set status: INPROGRESS");
+        monkeysphere.log("  status: INPROGRESS");
         icon.setAttribute("src", "chrome://monkeysphere/content/progress.gif");
         panel.hidden = false;
         break;
       case monkeysphere.states.VALID:
-        monkeysphere.log("set status: VALID");
+        monkeysphere.log("  status: VALID");
         icon.setAttribute("src", "chrome://monkeysphere/content/good.png");
         panel.hidden = false;
         break;
       case monkeysphere.states.NOTVALID:
-        monkeysphere.log("set status: NOTVALID");
+        monkeysphere.log("  status: NOTVALID");
         icon.setAttribute("src", "chrome://monkeysphere/content/bad.png");
         panel.hidden = false;
         break;
       case monkeysphere.states.NEUTRAL:
-        monkeysphere.log("set status: NEUTRAL");
+        monkeysphere.log("  status: NEUTRAL");
         icon.setAttribute("src", "");
         panel.hidden = true;
         break;
       case monkeysphere.states.ERROR:
-        monkeysphere.log("set status: ERROR");
+        monkeysphere.log("  status: ERROR");
         icon.setAttribute("src", "chrome://monkeysphere/content/error.png");
         panel.hidden = false;
         break;
     }
 
-    monkeysphere.log("set message: " + message);
+    monkeysphere.log("  message: " + message);
     panel.setAttribute("tooltiptext", message);
   },
 
@@ -403,6 +407,8 @@ var monkeysphere = {
         //alert(monkeysphere.messages.getString("agentError"));
         monkeysphere.setStatus(browser, monkeysphere.states.ERROR);
       }
+
+      monkeysphere.updateDisplay();
     }
   },
 

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