[Pkg-mozext-commits] [compactheader] 115/441: New version 1.0.2: Bugfix: Reset buttons in header pane when opening a message the frist time in a new window.

David Prévot taffit at moszumanska.debian.org
Wed Mar 18 12:28:50 UTC 2015


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

taffit pushed a commit to branch master
in repository compactheader.

commit 30f1be08a7922eae281fc4d8e9c421512e01c1fc
Author: joachim.herb <none at none>
Date:   Fri Dec 11 21:53:13 2009 +0000

    New version 1.0.2:
    Bugfix: Reset buttons in header pane when opening a message the frist time in a new window.
---
 .../CompactHeader/content/compactHeaderOverlay.js  | 145 +--------------------
 install.rdf                                        |   2 +-
 2 files changed, 7 insertions(+), 140 deletions(-)

diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 142a89c..d6b26df 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -117,7 +117,7 @@ org.mozdev.compactHeader.pane = function() {
   
   function coheOutputEmailAddresses(headerEntry, emailAddresses) {
     /* function copied from comm-1.9.1/ mail/ base/ content/ msgHdrViewOverlay.js 771135e6aaf5 */
-    if (!emailAddresses)
+  	if (!emailAddresses)
       return;
   
     var addresses = {};
@@ -249,14 +249,12 @@ org.mozdev.compactHeader.pane = function() {
       coheCheckFirstRun();
     }
     
-    if (cohe.firstrun) {
+    if (cohe.firstrun || document.getElementById("hdrReplyAllButton") == null) {
       org.mozdev.customizeHeaderToolbar.pane.CHTSetDefaultButtons();
       cohe.firstrun = false;
     }
     
     coheToggleHeaderContent();
-    setButtonStyle();
-    org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
   }
   
   var coheMessageListener = 
@@ -373,7 +371,7 @@ org.mozdev.compactHeader.pane = function() {
     var hdrToolbox = document.getElementById("header-view-toolbox");
     var buttons = ["button-reply", "button-replyall", "button-replylist", 
                    "button-tag", "button-forward", "button-archive", "button-file",
-                   "button-print", "button-mark", "button-starMessages"];
+                   "button-print", "button-mark"];
     var currentSet=hdrToolbar.getAttribute("currentset");
     hdrToolbar.currentSet = currentSet;
     for (var i=0; i<buttons.length; i++) {
@@ -386,7 +384,7 @@ org.mozdev.compactHeader.pane = function() {
           if (hdrButton.localName == "toolbaritem") {
             var subButtons = hdrButton.querySelectorAll(".toolbarbutton-1");
             for (var j=0; j<subButtons.length; j++) {
-              addClass(subButtons[j], "msgHeaderView-button-out");
+              addClass(subButtons[j], "msgHeaderView-button");
             }
           } else {
             if (hdrButton.type != "menu-button") {
@@ -434,99 +432,7 @@ org.mozdev.compactHeader.pane = function() {
       }
     }
   }
-
-  function setButtonStyle() {
-    var hdrToolbar = document.getElementById("header-view-toolbar");
-    var hdrToolbox = document.getElementById("header-view-toolbox");
-    var buttons = hdrToolbar.querySelectorAll("toolbarbutton");
-    for (var i=0; i<buttons.length; i++) {
-      var button = buttons[i];
-      if (button) {
-        addClass(button, "customize-header-toolbar-button");
-        addClass(button, "customize-header-toolbar-" + button.id)
-        if (cohePrefBranch.getBoolPref("headersize.flatButtons")) {
-          if (button.type != "menu-button") {
-            addClass(button, "msgHeaderView-flat-button");
-          } else {
-            removeClass(button, "msgHeaderView-flat-button");
-            removeClass(button, "msgHeaderView-button");
-            removeClass(button, "msgHeaderView-button-out");
-            addClass(button,    "msgHeaderView-flat-button-out");
-          }
-        } else {
-          if (button.type != "menu-button") {
-            removeClass(button, "msgHeaderView-flat-button");
-          } else {
-            removeClass(button, "msgHeaderView-flat-button");
-            removeClass(button, "msgHeaderView-button");
-            removeClass(button, "msgHeaderView-flat-button-out");
-            addClass(button,    "msgHeaderView-button-out");
-          }
-        }
-      }
-    }
-
-    var buttons = hdrToolbar.querySelectorAll("toolbaritem");
-    for (var i=0; i<buttons.length; i++) {
-      var button = buttons[i];
-      if (button) {
-        addClass(button, "customize-header-toolbar-button");
-        addClass(button, "customize-header-toolbar-" + button.id)
-        if (cohePrefBranch.getBoolPref("headersize.flatButtons")) {
-          removeClass(button, "msgHeaderView-button-out-item");
-          addClass(button,    "msgHeaderView-flat-button-out-item");
-        } else {
-          removeClass(button, "msgHeaderView-flat-button-out-item");
-          addClass(button,    "msgHeaderView-button-out-item");
-        }
-      }
-    }
-    
-    buttons = hdrToolbox.palette.querySelectorAll("toolbarbutton");
-    for (var i=0; i<buttons.length; i++) {
-      var button = buttons[i];
-      if (button) {
-        addClass(button, "customize-header-toolbar-button");
-        addClass(button, "customize-header-toolbar-" + button.id)
-        if (cohePrefBranch.getBoolPref("headersize.flatButtons")) {
-          if (button.getAttribute("type") != "menu-button") {
-            addClass(button, "msgHeaderView-flat-button");
-          } else {
-            removeClass(button, "msgHeaderView-flat-button");
-            removeClass(button, "msgHeaderView-button");
-            removeClass(button, "msgHeaderView-button-out");
-            addClass(button,    "msgHeaderView-flat-button-out");
-          }
-        } else {
-          if (button.getAttribute("type") != "menu-button") {
-            removeClass(button, "msgHeaderView-flat-button");
-          } else {
-            removeClass(button, "msgHeaderView-flat-button");
-            removeClass(button, "msgHeaderView-button");
-            removeClass(button, "msgHeaderView-flat-button-out");
-            addClass(button,    "msgHeaderView-button-out");
-          }
-        }
-      }
-    }
-
-    buttons = hdrToolbox.palette.querySelectorAll("toolbaritem");
-    for (var i=0; i<buttons.length; i++) {
-      var button = buttons[i];
-      if (button) {
-        addClass(button, "customize-header-toolbar-button");
-        addClass(button, "customize-header-toolbar-" + button.id)
-        if (cohePrefBranch.getBoolPref("headersize.flatButtons")) {
-          removeClass(button, "msgHeaderView-button-out-item");
-          addClass(button,    "msgHeaderView-flat-button-out-item");
-        } else {
-          removeClass(button, "msgHeaderView-flat-button-out-item");
-          addClass(button,    "msgHeaderView-button-out-item");
-        }
-      }
-    }
-  }
-
+  
   pub.coheToggleHeaderView = function() {
     gCoheCollapsedHeaderViewMode = !gCoheCollapsedHeaderViewMode;
     
@@ -558,44 +464,6 @@ org.mozdev.compactHeader.pane = function() {
     var strShowLabel = document.getElementById("CoheShowDetailsLabel").value;
     var strLabel;
     
-    var smimeBox = document.getElementById("smimeBox");
-    
-    if (smimeBox != null) {
-      if (gCoheCollapsedHeaderViewMode) {
-        var parent = document.getElementById("collapsed2LdateOutBox");
-        var refElement = document.getElementById("collapsed2LdateRow");
-        if (parent != null && refElement != null) {
-          parent.insertBefore(smimeBox, refElement);
-        }
-      }
-      else {
-        var parent = document.getElementById("dateValueBox");
-        var refElement = document.getElementById("dateLabel");
-        if (parent != null && refElement != null) {
-          parent.insertBefore(smimeBox, refElement);
-        }
-      }
-    }    
-    
-    var dispMUABox = document.getElementById("dispMUA");
-    
-    if (dispMUABox != null) {
-      if (gCoheCollapsedHeaderViewMode) {
-        var parent = document.getElementById("collapsed2LdateOutBox");
-        var refElement = document.getElementById("collapsed2LdateRow");
-        if (parent != null && refElement != null) {
-          parent.insertBefore(dispMUABox, refElement);
-        }
-      }
-      else {
-        var parent = document.getElementById("dateValueBox");
-        var refElement = document.getElementById("dateLabel");
-        if (parent != null && refElement != null) {
-          parent.insertBefore(dispMUABox, refElement);
-        }
-      }
-    }    
-
     org.mozdev.customizeHeaderToolbar.messenger.loadToolboxData();
   
     var hdrToolbox = document.getElementById("header-view-toolbox");
@@ -697,8 +565,7 @@ org.mozdev.compactHeader.pane = function() {
   }
   
   function removeClass(el, strClass) {
-    var str = new RegExp(strClass, 'g');
-    el.className = el.className.replace(str, '');
+    el.className = el.className.replace(strClass, '');
   }
   
   function CoheCopyWebsiteAddress(websiteAddressNode)
diff --git a/install.rdf b/install.rdf
index e7e5455..2665b7e 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
 
 	<RDF:Description about="urn:mozilla:install-manifest">
 		<em:name>CompactHeader</em:name>
-		<em:version>1.1.3</em:version>
+		<em:version>1.0.2</em:version>
 		<em:description>Add ability to reduce header size to one or two lines. Linkify subjects in RSS feeds.</em:description>
 		<em:creator>Joachim Herb</em:creator>
 		<em:contributor>Zamula</em:contributor>

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



More information about the Pkg-mozext-commits mailing list