[Pkg-mozext-commits] [compactheader] 153/441: New version 1.2.0beta2: Should fix header toggle problem after switching layouts.

[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 82cfbd19fe43af84814afcc3a2b0cdc5b8df56f8
Author: joachim.herb <none at none>
Date:   Mon May 3 21:15:29 2010 +0000

    New version 1.2.0beta2:
    Should fix header toggle problem after switching layouts.
---
 chrome/CompactHeader/content-31/buttonsOverlay.js  | 83 ----------------------
 chrome/CompactHeader/content-31/buttonsOverlay.xul | 29 --------
 .../content-31/compactHeaderOverlay.js             |  9 +--
 3 files changed, 5 insertions(+), 116 deletions(-)

diff --git a/chrome/CompactHeader/content-31/buttonsOverlay.js b/chrome/CompactHeader/content-31/buttonsOverlay.js
deleted file mode 100644
index bbcec15..0000000
--- a/chrome/CompactHeader/content-31/buttonsOverlay.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/*# -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Communicator client code, released
-# March 31, 1998.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-1999
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Joachim Herb <joachim.herb at gmx.de>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-*/
-
-if(!org) var org={};
-if(!org.mozdev) org.mozdev={};
-if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
-
-org.mozdev.compactHeader.buttons = function() {
-  var pub = {};
-  const MSG_FLAG_FLAGGED = 0x4;
-
-  pub.init = function () {
-    var mailSession = Components.classes["@mozilla.org/messenger/services/session;1"]
-                                .getService(Components.interfaces.nsIMsgMailSession);
-    var nsIFolderListener = Components.interfaces.nsIFolderListener;
-    mailSession.AddFolderListener(folderListener, nsIFolderListener.propertyFlagChanged);
-  }
-
-  pub.coheToggleStar = function () {
-    var starButton = document.getElementById("header-view-toolbox").getElementsByAttribute("id", "button-starMessages")[0];
-
-    if (starButton) {
-      //alert("test2");
-      var firstSelectedMessage = gFolderDisplay.selectedMessage;
-      if (firstSelectedMessage && firstSelectedMessage.isFlagged) {
-        starButton.setAttribute("flagged", "true");
-      }
-      else {
-        starButton.removeAttribute("flagged");
-      }
-    }
-  }
-
-  var folderListener = {
-    OnItemPropertyFlagChanged: function(item, property, oldFlag, newFlag) {
-      var changedFlag = oldFlag ^ newFlag;
-      
-      if (changedFlag & MSG_FLAG_FLAGGED) {
-        pub.coheToggleStar();
-      }
-    },
-  }
-  return pub;
-}();
-
-org.mozdev.compactHeader.buttons.init();
diff --git a/chrome/CompactHeader/content-31/buttonsOverlay.xul b/chrome/CompactHeader/content-31/buttonsOverlay.xul
deleted file mode 100644
index 4bc95a9..0000000
--- a/chrome/CompactHeader/content-31/buttonsOverlay.xul
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://CompactHeader-os/skin/buttonsOverlay.css" type="text/css"?>
-
-<!DOCTYPE overlay [
-  <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd">
-  %messengerDTD;
-]>
-
-<overlay id="CompactHeaderButtonsOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<script type="application/javascript" src="chrome://CompactHeader/content/buttonsOverlay.js"/>
-
-<!--ThunderBird-->
-<toolbarpalette id="MailToolbarPalette">
-
-<!--
-<script type="application/x-javascript" src="chrome://CompactHeader/content/buttons.js"/>
--->
-
-<toolbarbutton
-	class="toolbarbutton-1"
-	id="button-starMessages"
-	label="&markStarredCmd.label;"
-	tooltiptext="&markStarredCmd.label;"
-	oncommand="goDoCommand('cmd_markAsFlagged');" />
-</toolbarpalette>
-	
-</overlay>
diff --git a/chrome/CompactHeader/content-31/compactHeaderOverlay.js b/chrome/CompactHeader/content-31/compactHeaderOverlay.js
index 54b4bc3..2fe1f26 100644
--- a/chrome/CompactHeader/content-31/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content-31/compactHeaderOverlay.js
@@ -75,7 +75,7 @@ org.mozdev.compactHeader.pane = function() {
   var gCoheCollapsedHeader1LListLongAddresses = [
     {name:"subject", outputFunction:coheOutputSubject},
     {name:"from", useToggle:true, outputFunction:coheOutputEmailAddresses},
-    {name:"toCcBcc", useToggle:true, outputFunction:coheOutputEmailAddresses},
+//    {name:"toCcBcc", useToggle:true, outputFunction:coheOutputEmailAddresses},
     {name:"date", outputFunction:coheUpdateDateValue}
     ];
   
@@ -148,14 +148,15 @@ org.mozdev.compactHeader.pane = function() {
       } else {
         address.displayName = names.value[index];
       }
-      if (headerEntry.useToggle)
+      if (headerEntry.useToggle && (typeof headerEntry.enclosingBox.addAddressView == 'function')) {
         headerEntry.enclosingBox.addAddressView(address);
-      else
+      } else {
         updateEmailAddressNode(headerEntry.enclosingBox.emailAddressNode, address);
+      }
       index++;
     }
   
-    if (headerEntry.useToggle)
+    if (headerEntry.useToggle && (typeof headerEntry.enclosingBox.buildViews == 'function'))
       headerEntry.enclosingBox.buildViews();
     //OutputEmailAddresses(headerEntry, emailAddresses);
   }

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