[Pkg-mozext-commits] [compactheader] 234/441: No working: Replace dispMUAicon by broadcaster

[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 4b319de383864a6804c15a540ddc06630616a8eb
Author: joachim <none at none>
Date:   Sun Jul 24 12:44:37 2011 +0200

    No working: Replace dispMUAicon by broadcaster
    
    --HG--
    branch : B_broadcaster
---
 chrome/CompactHeader/content/buttonsOverlay.xul    |  4 +-
 .../CompactHeader/content/compactHeaderOverlay.xul |  6 +-
 chrome/CompactHeader/content/toolbar.js            | 67 ++++++++--------------
 3 files changed, 29 insertions(+), 48 deletions(-)

diff --git a/chrome/CompactHeader/content/buttonsOverlay.xul b/chrome/CompactHeader/content/buttonsOverlay.xul
index b755ba5..68a77ac 100644
--- a/chrome/CompactHeader/content/buttonsOverlay.xul
+++ b/chrome/CompactHeader/content/buttonsOverlay.xul
@@ -31,9 +31,9 @@
   image="chrome://dispmua/content/48x48/thunderbird-windows.png"
   label="display MUA"
   oncommand="dispMUA.infopopup();">
-  <observes element="dispMUAbroadcast" attribute="src"
+  <observes element="dispMUAicon" attribute="src"
             onbroadcast="org.mozdev.compactHeader.toolbar.onChangeDispMUAicon('src');"/>
-  <observes element="dispMUAbroadcast" attribute="tooltiptext"/>
+  <observes element="dispMUAicon" attribute="tooltiptext"/>
 </toolbarbutton>
 </toolbarpalette>
 
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index 397bab5..1b17fe8 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -123,7 +123,7 @@
     </vbox>
 
     <vbox id="dispMUAexp" collapsed="false">
-        <image id="dispMUAiconExp" observes="dispMUAbroadcast" tooltiptext="" style="width:48px; height:48px; margin-left:2px; margin-right:2px;" onclick="dispMUA.infopopup();"/>
+        <image id="dispMUAiconExp" observes="dispMUAicon" tooltiptext="" style="width:48px; height:48px; margin-left:2px; margin-right:2px;" onclick="dispMUA.infopopup();"/>
     </vbox>
 
   </vbox>
@@ -229,11 +229,11 @@
     </vbox>
 
     <vbox id="dispMUA2line">
-      <image id="dispMUAicon2line" observes="dispMUAbroadcast" tooltiptext="" style="width:32px; height:32px; margin-left:2px; margin-right:2px;" onclick="dispMUA.infopopup();"/>
+      <image id="dispMUAicon2line" observes="dispMUAicon" tooltiptext="" style="width:32px; height:32px; margin-left:2px; margin-right:2px;" onclick="dispMUA.infopopup();"/>
     </vbox>
 
     <vbox id="dispMUAcompact">
-      <image id="dispMUAiconCompact" observes="dispMUAbroadcast" tooltiptext="" style="width:24px; height:24px; margin:-2px 2px -2px 2px;" onclick="dispMUA.infopopup();"/>
+      <image id="dispMUAiconCompact" observes="dispMUAicon" tooltiptext="" style="width:24px; height:24px; margin:-2px 2px -2px 2px;" onclick="dispMUA.infopopup();"/>
     </vbox>
 
 
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index 38a8ce6..507d17b 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -252,7 +252,7 @@ org.mozdev.compactHeader.toolbar = function() {
     var dispMUAButton = document.getElementById("button-dispMUA");
     var dispMUABox = document.getElementById("dispMUA");
     if (dispMUABox) {
-      dispMUABox.setAttribute("collapsed", "true"); // hide original
+      hideDispMUABox(dispMUABox);
       var IconContainerDispMUA = null;
       if (dispMUAButton) {
         /* expanded view 48 * 48 */
@@ -316,52 +316,10 @@ org.mozdev.compactHeader.toolbar = function() {
       if (IconContainerDispMUA = document.getElementById("button-dispMUA")) {
         IconContainerDispMUA.setAttribute("image", imageSrc);
       }
-//      /* expanded view 48 * 48 */
-//      if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
-//        IconContainerDispMUA.setAttribute("src", imageSrc);
-//      }
-//      /* two line view 32 * 32 */
-//      if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
-//        IconContainerDispMUA.setAttribute("src", imageSrc);
-//      }
-//      /* compact view 24 * 24 */
-//      if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
-//        IconContainerDispMUA.setAttribute("src", imageSrc);
-//      }
-//      org.mozdev.compactHeader.debug.log("onChangeDispMUAicon stop");
-//    }
-//    else if (event.attrName == "tooltiptext") {
-//      org.mozdev.compactHeader.debug.log("onChangeDispMUAicon start");
-//      var tooltipText = document.getElementById("dispMUAicon").getAttribute("tooltiptext");
-//      var buttonDispMUA = document.getElementById("button-dispMUA");
-//      if (buttonDispMUA) {
-//        buttonDispMUA.setAttribute("tooltiptext", tooltipText);
-//      }
-//      /* expanded view 48 * 48 */
-//      if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
-//        IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
-//      }
-//      /* two line view 32 * 32 */
-//      if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
-//        IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
-//      }
-//      /* compact view 24 * 24 */
-//      if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
-//        IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
-//      }
       org.mozdev.compactHeader.debug.log("onChangeDispMUAicon stop");
     }
   };
 
-//  function onChangeHeaderToolbar(event) {
-//    if (event.attrName == "currentset") {
-//      if (document.getElementById("button-dispMUA")) {
-//        gDBView.reloadMessage();
-//      }
-//      dispMUACheck();
-//      org.mozdev.compactHeader.buttons.coheToggleStar();
-//    }
-//  }
   pub.onDoCustomizationHeaderViewToolbox = function(event) {
     if (event.attrName == "doCustomization") {
       org.mozdev.compactHeader.debug.log("onDoCustomizationHeaderViewToolbox start" + event);
@@ -392,6 +350,29 @@ org.mozdev.compactHeader.toolbar = function() {
     }
   };
 
+  hideDispMUABox = function(dispMUABox) {
+    org.mozdev.compactHeader.debug.log("hideDispMUABox start");
+    dispMUABox.setAttribute("collapsed", "true"); // hide original
+    var dispMUAicon = document.getElementById("dispMUAicon");
+    var messengerWindow = document.getElementById("messengerWindow");
+    if (dispMUAicon && messengerWindow && dispMUAicon.localName == "image") {
+      org.mozdev.compactHeader.debug.log("hideDispMUABox 1");
+      var broadcasterset = document.createElement("broadcasterset");
+      messengerWindow.appendChild(broadcasterset);
+      org.mozdev.compactHeader.debug.log("hideDispMUABox 2");
+      dispMUAicon.parentNode.removeChild(dispMUAicon);
+      org.mozdev.compactHeader.debug.log("hideDispMUABox 3");
+      var dispMUAbroadcast = document.createElement("broadcaster");
+      org.mozdev.compactHeader.debug.log("hideDispMUABox 4");
+      dispMUAbroadcast.id = "dispMUAicon";
+      //dispMUAbroadcast.setAttribute("src", "");
+      dispMUAbroadcast.setAttribute("tooltiptext", "");
+      org.mozdev.compactHeader.debug.log("hideDispMUABox 5");
+      broadcasterset.appendChild(dispMUAbroadcast);
+      org.mozdev.compactHeader.debug.log("hideDispMUABox 6");
+    }
+    org.mozdev.compactHeader.debug.log("hideDispMUABox stop");
+  };
 
   removeButtonDispMUA = function() {
     org.mozdev.compactHeader.debug.log("removeButtonDispMUA start");

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