[Pkg-mozext-commits] [compactheader] 224/441: Bugfixes after merge.

[David Prévot]

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

taffit pushed a commit to branch master
in repository compactheader.

commit 567993f2874ccd51b80c092d0d6b32cae72eb67e
Author: joachim <none at none>
Date:   Fri Jul 22 01:53:51 2011 +0200

    Bugfixes after merge.
    
    --HG--
    branch : B_DispMUA
---
 chrome/CompactHeader/content/RSSLinkify.js           |  6 +++---
 chrome/CompactHeader/content/compactHeaderOverlay.js |  2 +-
 chrome/CompactHeader/content/toolbar.js              | 16 +++-------------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/chrome/CompactHeader/content/RSSLinkify.js b/chrome/CompactHeader/content/RSSLinkify.js
index 5375420..8b9ec2d 100644
--- a/chrome/CompactHeader/content/RSSLinkify.js
+++ b/chrome/CompactHeader/content/RSSLinkify.js
@@ -61,7 +61,7 @@ org.mozdev.compactHeader.RSSLinkify = function() {
       newSubject: null
   };
   
-  pub.UpdateHeaderView = function(doc, currentHeaderData) {
+  pub.UpdateHeaderView = function(currentHeaderData) {
     org.mozdev.compactHeader.debug.log("updateheaderview start");
     if (!currentHeaderData) {
       org.mozdev.compactHeader.debug.log("updateheaderview: no currentHeaderData!");
@@ -82,10 +82,10 @@ org.mozdev.compactHeader.RSSLinkify = function() {
           RSSLinkify.oldSubject.setAttribute("collapsed", "false");
           RSSLinkify.oldSubject.setAttribute("tooltiptext", currentHeaderData["subject"].headerValue);
 //          if (gCoheCollapsedHeaderViewMode) {
-//            //linkifySubject(doc, 'collapsed1LsubjectBox');
+//            //linkifySubject('collapsed1LsubjectBox');
 //          }
 //          else {
-//            linkifySubject(doc, 'expandedsubjectBox');
+//            linkifySubject('expandedsubjectBox');
 //          }
       }
     } else {
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 7bd91fa..5194333 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -365,7 +365,7 @@ org.mozdev.compactHeader.pane = function() {
     if (gCoheCollapsedHeaderViewMode)
       showHeaderView(gCoheCollapsedHeaderView);
 
-    org.mozdev.compactHeader.RSSLinkify.UpdateHeaderView(document, currentHeaderData);
+    org.mozdev.compactHeader.RSSLinkify.UpdateHeaderView(currentHeaderData);
 
     if (cohePrefBranch.getBoolPref("headersize.addressstyle")) {
       selectEmailDisplayed();
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index 12aba97..ff2b920 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -56,7 +56,7 @@ org.mozdev.compactHeader.toolbar = function() {
 
   pub.fillToolboxPalette = function () {
     org.mozdev.compactHeader.debug.log("fillToolboxPalette start");
-    removeButtonDispMUA(doc);
+    removeButtonDispMUA();
     var hdrToolbar = document.getElementById("header-view-toolbar");
     var hdrToolbox = document.getElementById("header-view-toolbox");
     var buttons = ["button-reply", "button-replyall", "button-replylist", 
@@ -283,7 +283,7 @@ org.mozdev.compactHeader.toolbar = function() {
     org.mozdev.compactHeader.debug.log("toolbar toggle stop");
   };
 
-  pub.dispMUACheck = function(doc) {
+  pub.dispMUACheck = function() {
     org.mozdev.compactHeader.debug.log("dispMUACheck start");
     var dispMUAButton = document.getElementById("button-dispMUA");
     var dispMUABox = document.getElementById("dispMUA"); 
@@ -331,11 +331,6 @@ org.mozdev.compactHeader.toolbar = function() {
   pub.onChangeDispMUAicon = function(event) {
     if (event.attrName == "src") {
       org.mozdev.compactHeader.debug.log("onChangeDispMUAicon start");
-      var doc = event.originalTarget.ownerDocument;
-      if (!doc) {
-        org.mozdev.compactHeader.debug.log("onChangeDispMUAicon: no document!");
-        return;
-      }
       var imageSrc = document.getElementById("dispMUAicon").getAttribute("src");
       var IconContainerDispMUA = null;
       /* toolbar button */
@@ -358,11 +353,6 @@ org.mozdev.compactHeader.toolbar = function() {
     }
     else if (event.attrName == "tooltiptext") {
       org.mozdev.compactHeader.debug.log("onChangeDispMUAicon start");
-      var doc = event.originalTarget.ownerDocument;
-      if (!doc) {
-        org.mozdev.compactHeader.debug.log("onChangeDispMUAicon: no document!");
-        return;
-      }
       var tooltipText = document.getElementById("dispMUAicon").getAttribute("tooltiptext");
       var buttonDispMUA = document.getElementById("button-dispMUA");
       if (buttonDispMUA) {
@@ -394,7 +384,7 @@ org.mozdev.compactHeader.toolbar = function() {
 //    }
 //  }
   
-  removeButtonDispMUA = function(doc) {
+  removeButtonDispMUA = function() {
     org.mozdev.compactHeader.debug.log("removeButtonDispMUA start");
     if (!document.getElementById("dispMUA")) {
       var button = document.getElementById("button-dispMUA");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git