[Pkg-mozext-commits] [compactheader] 04/07: Imported Upstream version 2.1.1~beta1

[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 fa66277a2927671615eee71be8b102bd397178b2
Merge: d48b8b0 e7d0678
Author: David Prévot <david at tilapin.org>
Date:   Sat May 2 10:51:44 2015 -0400

    Imported Upstream version 2.1.1~beta1

 chrome.manifest                                    |  1 +
 chrome/CompactHeader/content/buttonsOverlay.js     |  7 +++-
 .../CompactHeader/content/compactHeaderOverlay.js  |  6 +++
 .../CompactHeader/locale/pt-BR/CompactHeader.dtd   | 42 +++++++++++++++++++
 chrome/CompactHeader/locale/pt-BR/preferences.dtd  | 49 ++++++++++++++++++++++
 install.rdf                                        |  2 +-
 6 files changed, 105 insertions(+), 2 deletions(-)

diff --cc chrome/CompactHeader/content/buttonsOverlay.js
index f9832b1,f9832b1..a32484c
--- a/chrome/CompactHeader/content/buttonsOverlay.js
+++ b/chrome/CompactHeader/content/buttonsOverlay.js
@@@ -52,7 -52,7 +52,12 @@@ org_mozdev_compactHeader.buttons = func
                                  .getService(Components.interfaces.nsIMsgMailSession);
      var nsIFolderListener = Components.interfaces.nsIFolderListener;
      mailSession.AddFolderListener(folderListener, nsIFolderListener.propertyFlagChanged);
--    window.addEventListener("load", function(e) { pub.singlemessage_controller.onLoad(e); }, false);
++    window.addEventListener("load", function loadEventListener(e)
++    {
++      window.removeEventListener("load", loadEventListener, false);
++      pub.singlemessage_controller.onLoad(e);
++    },
++    false);
    }
  
    pub.coheToggleStar = function () {
diff --cc chrome/CompactHeader/content/compactHeaderOverlay.js
index d047579,d047579..e7f9321
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@@ -785,6 -785,6 +785,7 @@@ org_mozdev_compactHeader.pane = functio
  
  
    pub.coheInitializeOverlay = function() {
++    removeEventListener('load', org_mozdev_compactHeader.pane.coheInitializeOverlay, false);
      org_mozdev_compactHeader.debug.log("before register");
      coheUninstallObserver.register();
      myPrefObserver.register();
@@@ -893,6 -893,6 +894,11 @@@
    }
  
    function multiMessageLoaded() {
++    var multiMessage = document.getElementById("multimessage");
++    if (multiMessage) {
++      multiMessage.removeEventListener("DOMContentLoaded", multiMessageLoaded, false);
++    }
++
      org_mozdev_compactHeader.debug.log("multiMessageLoaded start");
      org_mozdev_compactHeader.toolbar.setCurrentToolboxPosition(gCoheCollapsedHeaderViewMode);
      org_mozdev_compactHeader.debug.log("multiMessageLoaded stop");

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