[Pkg-mozext-commits] [compactheader] 223/441: Merged with version 1.4.2beta1
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:01 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 543dbe6555859b9e8bf3635510c926eff2d6e714
Merge: eb5a6d2 ec3f762
Author: Joachim.Herb at gmx.de <Joachim.Herb at gmx.de>
Date: Fri Jul 22 01:48:24 2011 +0200
Merged with version 1.4.2beta1
--HG--
branch : B_DispMUA
rename : chrome/CompactHeader/content/RSSLinkify.jsm => chrome/CompactHeader/content/RSSLinkify.js
rename : chrome/CompactHeader/content/toolbar.jsm => chrome/CompactHeader/content/toolbar.js
.hgtags | 1 +
build.xml | 2 +-
.../content/{RSSLinkify.jsm => RSSLinkify.js} | 28 +--
.../CompactHeader/content/compactHeaderOverlay.js | 205 ++++++++++-----------
.../CompactHeader/content/compactHeaderOverlay.xul | 3 +
.../content/customizeToolbarOverlay.xul | 3 +
.../CompactHeader/content/{debug.jsm => debug.js} | 0
.../content/{toolbar.jsm => toolbar.js} | 97 +++++-----
install.rdf | 4 +-
9 files changed, 177 insertions(+), 166 deletions(-)
diff --cc chrome/CompactHeader/content/RSSLinkify.js
index d3daf24,8b9ec2d..5375420
--- a/chrome/CompactHeader/content/RSSLinkify.js
+++ b/chrome/CompactHeader/content/RSSLinkify.js
@@@ -61,8 -61,12 +61,12 @@@ org.mozdev.compactHeader.RSSLinkify = f
newSubject: null
};
- pub.UpdateHeaderView = function(currentHeaderData) {
+ pub.UpdateHeaderView = function(doc, currentHeaderData) {
org.mozdev.compactHeader.debug.log("updateheaderview start");
+ if (!currentHeaderData) {
+ org.mozdev.compactHeader.debug.log("updateheaderview: no currentHeaderData!");
+ return;
+ }
if (cohePrefBranch.getBoolPref("headersize.linkify")) {
var url = currentHeaderData["content-base"];
if(url) {
diff --cc chrome/CompactHeader/content/compactHeaderOverlay.js
index 0937be3,869e923..7bd91fa
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@@ -195,29 -195,12 +195,29 @@@ org.mozdev.compactHeader.pane = functio
.getService(Components.interfaces.nsIAbManager)
.addAddressBookListener(coheAddressBookListener,
Components.interfaces.nsIAbListener.all);
-
+
var deckHeaderView = document.getElementById("msgHeaderViewDeck");
-
- gCoheCollapsedHeaderViewMode =
- deckHeaderView.selectedPanel == document.getElementById('collapsedHeaderView');
-
+
+ gCoheCollapsedHeaderViewMode =
+ deckHeaderView.selectedPanel == document.getElementById('collapsedHeaderView');
+
+ var headerViewToolbox = document.getElementById("header-view-toolbox");
+ if (headerViewToolbox) {
+ headerViewToolbox.addEventListener("DOMAttrModified",
+ onDoCustomizationHeaderViewToolbox, false);
+ }
+
+ var mailToolbox = document.getElementById("mail-toolbox");
+ if (mailToolbox) {
+ mailToolbox.addEventListener("DOMAttrModified",
+ onDoCustomizationHeaderViewToolbox, false);
+ }
+ var dispMUAicon = document.getElementById("dispMUAicon");
+ if (dispMUAicon) {
+ dispMUAicon.addEventListener("DOMAttrModified",
+ org.mozdev.compactHeader.toolbar.onChangeDispMUAicon, false);
+ }
+
// work around XUL deck bug where collapsed header view, if it's the persisted
// default, wouldn't be sized properly because of the larger expanded
// view "stretches" the deck.
@@@ -258,31 -241,26 +258,31 @@@
}
coheToggleHeaderContent();
+ var dispMUA = document.getElementById('dispMUA');
+ if (dispMUA) {
+ dispMUA.collapsed = true;
+ }
- org.mozdev.compactHeader.toolbar.setButtonStyle(document);
+ org.mozdev.compactHeader.toolbar.setButtonStyle();
org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
- org.mozdev.compactHeader.toolbar.dispMUACheck(document);
++ org.mozdev.compactHeader.toolbar.dispMUACheck();
}
-
- var coheMessageListener =
+
+ var coheMessageListener =
{
- onStartHeaders:
+ onStartHeaders:
function cML_onStartHeaders () {
- gCoheBuiltCollapsedView = false;
+ gCoheBuiltCollapsedView = false;
},
-
- onEndHeaders:
+
+ onEndHeaders:
function cML_onEndHeaders() {
- ClearHeaderView(gCoheCollapsedHeaderView);
+ ClearHeaderView(gCoheCollapsedHeaderView);
coheUpdateMessageHeaders();
},
-
+
onEndAttachments: function cML_onEndAttachments(){}
};
-
+
pub.coheOnUnloadMsgHeaderPane = function()
{
Components.classes["@mozilla.org/abmanager;1"]
@@@ -327,51 -305,21 +327,51 @@@
}
});
}
-
+
+ onDoCustomizationHeaderViewToolbox = function(event) {
+ if (event.attrName == "doCustomization") {
+ org.mozdev.compactHeader.debug.log("onDoCustomizationHeaderViewToolbox start");
+ org.mozdev.compactHeader.toolbar.dispMUACheck(document);
+ org.mozdev.compactHeader.buttons.coheToggleStar();
+ var dispMUAicon = document.getElementById("dispMUAicon");
+ if (dispMUAicon) {
+ var evt1 = document.createEvent("MutationEvents");
+ evt1.initMutationEvent("DOMAttrModified",
+ true, false, dispMUAicon,
+ dispMUAicon.getAttribute("src"),
+ dispMUAicon.getAttribute("src"),
+ "src",
+ evt1.MODIFICATION
+ );
+ dispMUAicon.dispatchEvent(evt1);
+ var evt2 = document.createEvent("MutationEvents");
+ evt2.initMutationEvent("DOMAttrModified",
+ true, false, dispMUAicon,
+ dispMUAicon.getAttribute("tooltiptext"),
+ dispMUAicon.getAttribute("tooltiptext"),
+ "tooltiptext",
+ evt2.MODIFICATION
+ );
+ dispMUAicon.dispatchEvent(evt2);
+ }
+ org.mozdev.compactHeader.debug.log("onDoCustomizationHeaderViewToolbox done");
+ }
+ };
+
// make sure the appropriate fields within the currently displayed view header mode
// are collapsed or visible...
function coheUpdateHeaderView()
{
if (gCoheCollapsedHeaderViewMode)
showHeaderView(gCoheCollapsedHeaderView);
-
+
- org.mozdev.compactHeader.RSSLinkify.UpdateHeaderView(currentHeaderData);
+ org.mozdev.compactHeader.RSSLinkify.UpdateHeaderView(document, currentHeaderData);
-
+
if (cohePrefBranch.getBoolPref("headersize.addressstyle")) {
selectEmailDisplayed();
}
-
+
- //org.mozdev.compactHeader.toolbar.fillToolboxPalette();
+ //org.mozdev.compactHeader.toolbar.fillToolboxPalette(document);
coheToggleHeaderContent();
org.mozdev.customizeHeaderToolbar.pane.CHTUpdateReplyButton();
org.mozdev.customizeHeaderToolbar.pane.CHTUpdateJunkButton();
@@@ -436,11 -384,10 +436,11 @@@
parent.insertBefore(smimeBox, refElement);
}
}
- }
-
+ }
+
+
var dispMUABox = document.getElementById("dispMUA");
-
+
if (dispMUABox != null) {
if (gCoheCollapsedHeaderViewMode) {
var parent = document.getElementById("collapsed2LdateOutBox");
diff --cc chrome/CompactHeader/content/toolbar.js
index 282376d,8afaf06..12aba97
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@@ -54,11 -54,10 +54,11 @@@ org.mozdev.compactHeader.toolbar = func
.getService(Components.interfaces.nsIPrefService)
.getBranch("extensions.CompactHeader.");
- pub.fillToolboxPalette = function (doc) {
+ pub.fillToolboxPalette = function () {
org.mozdev.compactHeader.debug.log("fillToolboxPalette start");
- var hdrToolbar = doc.getElementById("header-view-toolbar");
- var hdrToolbox = doc.getElementById("header-view-toolbox");
+ removeButtonDispMUA(doc);
+ var hdrToolbar = document.getElementById("header-view-toolbar");
+ 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",
@@@ -100,8 -98,8 +100,7 @@@
}
//hdrButton.id = "hdr" + hdrButton.id;
hdrToolbox.palette.appendChild(hdrButton);
- /* var bStyle = doc.defaultView.getComputedStyle(button, null);
- hdrButton.style.MozImageRegion = bStyle.MozImageRegion;
+ /* var bStyle = document.defaultView.getComputedStyle(button, null);
- hdrButton.style.MozImageRegion = bStyle.MozImageRegion;
hdrButton.style.listStyleImage = bStyle.listStyleImage;*/
}
if (currentSet.indexOf(buttonName)>=0) {
@@@ -236,14 -234,16 +235,16 @@@
org.mozdev.compactHeader.debug.log("setButtonStyle stop");
};
- pub.toggle = function(doc, aHeaderViewMode) {
+ pub.toggle = function(aHeaderViewMode) {
+ org.mozdev.compactHeader.debug.log("toolbar toggle start");
- var hdrToolbox = doc.getElementById("header-view-toolbox");
- var hdrToolbar = doc.getElementById("header-view-toolbar");
+ var hdrToolbox = document.getElementById("header-view-toolbox");
+ var hdrToolbar = document.getElementById("header-view-toolbar");
+ var strHideLabel = document.getElementById("CoheHideDetailsLabel").value;
+ var strShowLabel = document.getElementById("CoheShowDetailsLabel").value;
var firstPermanentChild = hdrToolbar.firstPermanentChild;
var lastPermanentChild = hdrToolbar.lastPermanentChild;
if (aHeaderViewMode) {
- var cBox = doc.getElementById("collapsed2LButtonBox");
- strLabel = strShowLabel;
+ var cBox = document.getElementById("collapsed2LButtonBox");
if (cBox.parentNode.id != hdrToolbox.parentNode.id) {
var cloneToolboxPalette;
var cloneToolbarset;
@@@ -261,7 -261,8 +262,7 @@@
hdrToolbar.lastPermanentChild = lastPermanentChild;
}
} else {
- var cBox = doc.getElementById("expandedHeaders");
- strLabel = strHideLabel;
+ var cBox = document.getElementById("expandedHeaders");
if (cBox.parentNode.id != hdrToolbox.parentNode.id) {
var cloneToolboxPalette;
var cloneToolbarset;
@@@ -279,139 -280,6 +280,139 @@@
hdrToolbar.lastPermanentChild = lastPermanentChild;
}
}
+ org.mozdev.compactHeader.debug.log("toolbar toggle stop");
+ };
+
+ pub.dispMUACheck = function(doc) {
+ org.mozdev.compactHeader.debug.log("dispMUACheck start");
- var dispMUAButton = doc.getElementById("button-dispMUA");
- var dispMUABox = doc.getElementById("dispMUA");
++ var dispMUAButton = document.getElementById("button-dispMUA");
++ var dispMUABox = document.getElementById("dispMUA");
+ dispMUABox.setAttribute("collapsed", "true"); // hide original
+ var IconContainerDispMUA = null;
+ if (dispMUAButton) {
+ /* expanded view 48 * 48 */
- if (IconContainerDispMUA = doc.getElementById("dispMUAiconExp")) {
++ if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ IconContainerDispMUA.setAttribute("collapsed", "true");
+ }
+ /* two line view 32 * 32 */
- if (IconContainerDispMUA = doc.getElementById("dispMUAicon2line")) {
++ if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
+ IconContainerDispMUA.setAttribute("collapsed", "true");
+ }
+ /* compact view 24 * 24 */
- if (IconContainerDispMUA = doc.getElementById("dispMUAiconCompact")) {
++ if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
+ IconContainerDispMUA.setAttribute("collapsed", "true");
+ }
+
+ }
+ else if (dispMUABox){
+
+ /* expanded view 48 * 48 */
- if (IconContainerDispMUA = doc.getElementById("dispMUAiconExp")) {
++ if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ IconContainerDispMUA.removeAttribute("collapsed");
+ }
+ if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
+ /* two line view 32 * 32 */
- if (IconContainerDispMUA = doc.getElementById("dispMUAicon2line"))
++ if (IconContainerDispMUA = document.getElementById("dispMUAicon2line"))
+ IconContainerDispMUA.removeAttribute("collapsed");
- if (IconContainerDispMUA = doc.getElementById("dispMUAiconCompact"))
++ if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact"))
+ IconContainerDispMUA.setAttribute("collapsed", "true");
+ }
+ else {
+ /* compact view 24 * 24 */
- if (IconContainerDispMUA = doc.getElementById("dispMUAiconCompact"))
++ if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact"))
+ IconContainerDispMUA.removeAttribute("collapsed");
- if (IconContainerDispMUA = doc.getElementById("dispMUAicon2line"))
++ if (IconContainerDispMUA = document.getElementById("dispMUAicon2line"))
+ IconContainerDispMUA.setAttribute("collapsed", "true");
+ }
+ }
+ org.mozdev.compactHeader.debug.log("dispMUACheck stop");
+ };
+
+ 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 = doc.getElementById("dispMUAicon").getAttribute("src");
++ var imageSrc = document.getElementById("dispMUAicon").getAttribute("src");
+ var IconContainerDispMUA = null;
+ /* toolbar button */
- if (IconContainerDispMUA = doc.getElementById("button-dispMUA")) {
++ if (IconContainerDispMUA = document.getElementById("button-dispMUA")) {
+ IconContainerDispMUA.setAttribute("image", imageSrc);
+ }
+ /* expanded view 48 * 48 */
- if (IconContainerDispMUA = doc.getElementById("dispMUAiconExp")) {
++ if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ IconContainerDispMUA.setAttribute("src", imageSrc);
+ }
+ /* two line view 32 * 32 */
- if (IconContainerDispMUA = doc.getElementById("dispMUAicon2line")) {
++ if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
+ IconContainerDispMUA.setAttribute("src", imageSrc);
+ }
+ /* compact view 24 * 24 */
- if (IconContainerDispMUA = doc.getElementById("dispMUAiconCompact")) {
++ 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 doc = event.originalTarget.ownerDocument;
+ if (!doc) {
+ org.mozdev.compactHeader.debug.log("onChangeDispMUAicon: no document!");
+ return;
+ }
- var tooltipText = doc.getElementById("dispMUAicon").getAttribute("tooltiptext");
- var buttonDispMUA = doc.getElementById("button-dispMUA");
++ 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 = doc.getElementById("dispMUAiconExp")) {
++ if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
+ }
+ /* two line view 32 * 32 */
- if (IconContainerDispMUA = doc.getElementById("dispMUAicon2line")) {
++ if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
+ IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
+ }
+ /* compact view 24 * 24 */
- if (IconContainerDispMUA = doc.getElementById("dispMUAiconCompact")) {
++ if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
+ IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
+ }
+ org.mozdev.compactHeader.debug.log("onChangeDispMUAicon stop");
+ }
+ };
+
+// function onChangeHeaderToolbar(event) {
+// if (event.attrName == "currentset") {
- // if (doc.getElementById("button-dispMUA")) {
++// if (document.getElementById("button-dispMUA")) {
+// gDBView.reloadMessage();
+// }
+// dispMUACheck();
+// org.mozdev.compactHeader.buttons.coheToggleStar();
+// }
+// }
+
+ removeButtonDispMUA = function(doc) {
+ org.mozdev.compactHeader.debug.log("removeButtonDispMUA start");
- if (!doc.getElementById("dispMUA")) {
- var button = doc.getElementById("button-dispMUA");
++ if (!document.getElementById("dispMUA")) {
++ var button = document.getElementById("button-dispMUA");
+ if (button) {
+ button.parentNode.removeChild(button);
+ }
+
- var button1 = doc.getElementById("mail-toolbox").palette.getElementsByAttribute("id", "button-dispMUA")[0];
++ var button1 = document.getElementById("mail-toolbox").palette.getElementsByAttribute("id", "button-dispMUA")[0];
+ if (button1) {
+ button1.parentNode.removeChild(button1);
+ }
+
- var button2 = doc.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", "button-dispMUA")[0];
++ var button2 = document.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", "button-dispMUA")[0];
+ if (button2) {
+ button2.parentNode.removeChild(button2);
+ }
+ }
+ org.mozdev.compactHeader.debug.log("removeButtonDispMUA stop");
};
function addClass(el, strClass) {
diff --cc install.rdf
index 49121c0,86647e8..8509b69
--- a/install.rdf
+++ b/install.rdf
@@@ -6,7 -6,7 +6,7 @@@
<RDF:Description about="urn:mozilla:install-manifest">
<em:name>CompactHeader</em:name>
-- <em:version>1.4.2beta1</em:version>
++ <em:version>1.4.2beta2</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