[Pkg-mozext-commits] [compactheader] 283/441: Merged in B_broadcast branch: No more need for weired timeout callback function
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:10 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 c10b1fba6b9c89ad54c4aaef8aa4dcf03d6a9fa5
Merge: 764d5bc 4b319de
Author: Joachim.Herb at gmx.de <Joachim.Herb at gmx.de>
Date: Fri Sep 23 21:07:34 2011 +0200
Merged in B_broadcast branch: No more need for weired timeout callback function
chrome/CompactHeader/content/buttonsOverlay.xul | 4 ++
.../content/compactHeaderOverlay-9.xul | 6 +--
.../CompactHeader/content/compactHeaderOverlay.js | 4 +-
.../CompactHeader/content/compactHeaderOverlay.xul | 6 +--
chrome/CompactHeader/content/toolbar.js | 60 ++++++++++------------
5 files changed, 38 insertions(+), 42 deletions(-)
diff --cc chrome/CompactHeader/content/buttonsOverlay.xul
index 369be68,68a77ac..c8db9e4
--- a/chrome/CompactHeader/content/buttonsOverlay.xul
+++ b/chrome/CompactHeader/content/buttonsOverlay.xul
@@@ -7,9 -7,10 +7,10 @@@
%messengerDTD;
]>
-<overlay id="CompactHeaderButtonsOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<overlay id="CompactHeader_ButtonsOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://CompactHeader/content/buttonsOverlay.js"/>
+ <script type="application/javascript" src="chrome://CompactHeader/content/toolbar.js"/>
<!--ThunderBird-->
<toolbarpalette id="MailToolbarPalette">
diff --cc chrome/CompactHeader/content/compactHeaderOverlay-9.xul
index f468925,0000000..e7e49b4
mode 100644,000000..100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
@@@ -1,240 -1,0 +1,240 @@@
+<?xml version="1.0" ?>
+
+<!DOCTYPE overlay [
+ <!ENTITY % msgHeaderDTD SYSTEM
+ "chrome://messenger/locale/msgHdrViewOverlay.dtd">
+ %msgHeaderDTD;
+ <!ENTITY % compactHeaderDTD SYSTEM
+ "chrome://CompactHeader/locale/CompactHeader.dtd">
+ %compactHeaderDTD;
+ <!ENTITY % preferencesDTD SYSTEM
+ "chrome://CompactHeader/locale/preferences.dtd">
+ %preferencesDTD;
+ <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd">
+ %messengerDTD;
+]>
+
+<?xml-stylesheet href="chrome://CompactHeader/skin/CompactHeader.css" type="text/css"?>
+<?xml-stylesheet href="chrome://CompactHeader-os/skin/osdef.css" type="text/css"?>
+
+
+<overlay id="compactHeaderOverlay"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <script type="application/javascript" src="chrome://CompactHeader/content/debug.js"/>
+ <script type="application/javascript" src="chrome://CompactHeader/content/compactHeaderOverlay.js"/>
+ <script type="application/javascript" src="chrome://CompactHeader/content/RSSLinkify.js"/>
+ <script type="application/javascript" src="chrome://CompactHeader/content/toolbar.js"/>
+ <script type="application/javascript" src="chrome://CompactHeader/content/buttonsOverlay.js"/>
+
+ <keyset>
+ <key id="CompactHeader_hideDetailsKey"
+ modifiers="shift"
+ key="&CompactHeader_toggleDetails.key;"
+ oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
+ </keyset>
+
+ <menupopup id="header-toolbar-context-menu">
+ <menuitem id="CompactHeader_hidecohePreferencesButton"
+ label="&CompactHeader_dialog.title;"
+ oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,resizable=no,centerscreen,modal');"/>
+ </menupopup>
+
+ <deck id="msgHeaderViewDeck">
+
+ <vbox id="expandedHeaderView" orient="horizontal">
+ <vbox id="CompactHeader_hideDetailsButtonBox" insertbefore="expandedHeadersBox">
+ <button id="CompactHeader_hideDetailsButton"
+ tooltiptext="&CompactHeader_hideDetailsButton.label;"
+ onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+ class="msgHeaderView-flat-button"/>
+ </vbox>
+
+ <hbox id="CompactHeader_coheStringTransferBox" hidden="true">
+ <label id="CompactHeader_CoheHideDetailsLabel" value="&CompactHeader_hideDetailsButton.label;"/>
+ <label id="CompactHeader_CoheShowDetailsLabel" value="&CompactHeader_showDetailsButton.label;"/>
+ </hbox>
+
+ <vbox id="expandedHeadersBox">
+ <hbox id="expandedHeadersTopBox" flex="1">
+ <toolbox id="header-view-toolbox"
+ mode="icons"
+ defaultmode="icons">
+ <toolbarpalette id="header-view-toolbar-palette">
+ <toolbarbutton id="CompactHeader_hdrOtherActionsButton"
+ label="&otherActionsButton1.label;"
+ tooltiptext="&otherActionsButton1.label;"
+ class="toolbarbutton-1 msgHeaderView-button hdrOtherActionsButton"
+ type="menu"/>
+ </toolbarpalette>
+ <toolbar id="header-view-toolbar"
+ mode="icons" defaultmode="icons"
+ defaultset="hdrReplyToSenderButton,hdrForwardButton,button-reply,button-forward,hdrArchiveButton,hdrJunkButton,hdrTrashButton,CompactHeader_hdrOtherActionsButton">
+ </toolbar>
+ </toolbox>
+ </hbox>
+
+
+ <hbox id="expandedHeadersBottomBox">
+
+ <vbox id="otherActionsBox" flex="0">
+ <hbox id="dateValueBox" flex="0"/>
+ <button type="menu" id="otherActionsButton" collapsed="true"
+ label="&otherActionsButton1.label;"
+ class="msgHeaderView-button msgHeaderView-flat-button">
+ <menupopup id="otherActionsPopup" onpopupshowing="InitMessageMark()">
+ <menuitem id="CompactHeader_hdrPane-markFlagged"
+ type="checkbox"
+ label="&markStarredCmd.label;"
+ accesskey="&markStarredCmd.accesskey;"
+ command="cmd_markAsFlagged"
+ insertbefore="viewSourceMenuItem"
+ key="key_toggleFlagged"/>
+ <menu id="CompactHeader_hdrPane-HeadersPopupMenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
+ <menupopup id="menu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
+ <menuitem id="CompactHeader_hdrPane-viewallheaders"
+ type="radio"
+ name="viewheadergroup"
+ label="&headersAllCmd.label;"
+ accesskey="&headersAllCmd.accesskey;"
+ command="cmd_viewAllHeader"/>
+ <menuitem id="CompactHeader_hdrPane-viewnormalheaders"
+ type="radio"
+ name="viewheadergroup"
+ label="&headersNormalCmd.label;"
+ accesskey="&headersNormalCmd.accesskey;"
+ command="cmd_viewNormalHeader"/>
+ </menupopup>
+ </menu>
+ <menuseparator id="otherActionPopupAfterViewSource"/>
+ <menuitem id="CompactHeader_hideDetailsMenu"
+ label="&CompactHeader_hideDetailsButton.label;"
+ oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
+ <menuitem id="CompactHeader_hidecohePreferencesButton"
+ label="&CompactHeader_dialog.title;"
+ oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,centerscreen,dependent,all,resizable=no');"/>
+ </menupopup>
+ </button>
+ </vbox>
+ </hbox>
+
+ </vbox>
+
+ <vbox id="CompactHeader_dispMUAexp" collapsed="false">
- <image id="CompactHeader_dispMUAiconExp" tooltiptext=""
++ <image id="CompactHeader_dispMUAiconExp" observes="dispMUAicon" tooltiptext=""
+ style="width:48px; height:48px; margin-left:2px; margin-right:2px;"
+ onclick="dispMUA.infopopup();"/>
+ </vbox>
+
+ </vbox>
+
+ <vbox id="CompactHeader_collapsedHeaderView" orient="horizontal" flex="1">
+ <menupopup id="CompactHeader_CohecopyUrlPopup" popupanchor="bottomleft">
+ <menuitem label="©LinkCmd.label;" accesskey="©LinkCmd.accesskey;"
+ oncommand="org.mozdev.compactHeader.RSSLinkify.CoheCopyWebsiteAddress(document.popupNode)"/>
+ </menupopup>
+ <vbox id="CompactHeader_showDetailsButtonBox" align="start" flex="0">
+ <button id="CompactHeader_showDetailsButton"
+ tooltiptext="&CompactHeader_showDetailsButton.label;"
+ onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+ class="msgHeaderView-flat-button"/>
+ </vbox>
+ <vbox id="CompactHeader_collapsed1LHeadersBox" flex="1" collapsed="false">
+ <hbox id="CompactHeader_collapsed1LHeaderViewFirstLine" flex="0">
+ <hbox id="CompactHeader_collapsed1LsubjectOutBox" align="start" flex="99">
+ <row id="CompactHeader_collapsed1LsubjectRow" flex="99">
+ <mail-headerfield id="CompactHeader_collapsed1LsubjectBox" flex="99"/>
+ </row>
+ </hbox>
+ <hbox id="CompactHeader_collapsed1LfromOutBox" align="start" flex="0">
+ <grid flex="1">
+ <columns>
+ <column flex="0"/>
+ </columns>
+ <rows>
+ <row id="CompactHeader_collapsed1LfromRow">
+ <mail-multi-emailHeaderField id="CompactHeader_collapsed1LfromBox" flex="0"/>
+ </row>
+ </rows>
+ </grid>
+ </hbox>
+ <hbox id="CompactHeader_collapsed1LdateOutBox" align="start" pack="end" flex="0">
+ <row id="CompactHeader_collapsed1LdateRow">
+ <label id="CompactHeader_collapsed1LdateBox" class="dateLabel" flex="1"/>
+ </row>
+ </hbox>
+ <header-view-button-box id="CompactHeader_collapsed1LButtonBox" flex="0" align="start" hidden="true"/>
+ </hbox>
+ <hbox id="CompactHeader_collapsed1LHeaderViewSecondLine" align="top" flex="1" collapsed="true">
+ </hbox>
+ </vbox>
+
+ <vbox id="CompactHeader_collapsed2LHeadersBox" flex="1" collapsed="true">
+ <hbox id="CompactHeader_collapsed2LHeaderViewFirstLine" flex="0">
+ <hbox id="CompactHeader_collapsed2LfromOutBox" align="start" flex="0">
+ <grid flex="1">
+ <columns>
+ <column flex="0"/>
+ </columns>
+ <rows>
+ <row id="CompactHeader_collapsed2LfromRow">
+ <mail-multi-emailHeaderField id="CompactHeader_collapsed2LfromBox" flex="0"/>
+ </row>
+ </rows>
+ </grid>
+ </hbox>
+ <grid id="CompactHeader_collapsed2LtoCcBccOutBox" flex="1">
+ <columns>
+ <column flex="0"/>
+ <column flex="1"/>
+ </columns>
+ <rows>
+ <row id="CompactHeader_collapsed2LtoCcBccRow" align="baseline">
+ <label id="CompactHeader_collapsed2LtoCcBccLabel" class="headerName"
+ value="&toField3.label;" control="CompactHeader_collapsed2LtoCcBccBox"/>
+ <mail-multi-emailHeaderField id="CompactHeader_collapsed2LtoCcBccBox" flex="1"/>
+ </row>
+ </rows>
+ </grid>
+ <header-view-button-box id="CompactHeader_collapsed2LButtonBox" flex="0" align="start"/>
+ </hbox>
+ <hbox id="CompactHeader_collapsed2LHeaderViewSecondLine" align="top" flex="1">
+ <hbox id="CompactHeader_collapsed2LsubjectOutBox" align="top" flex="99">
+ <row id="CompactHeader_collapsed2LsubjectRow" flex="99">
+ <mail-headerfield id="CompactHeader_collapsed2LsubjectBox" flex="99"/>
+ </row>
+ </hbox>
+ <hbox id="CompactHeader_collapsed2LdateOutBox" align="top" pack="end" flex="0">
+ <row id="CompactHeader_collapsed2LdateRow" align="top" pack="end">
+ <label id="CompactHeader_collapsed2LdateBox" class="dateLabel" flex="1"/>
+ </row>
+ </hbox>
+ </hbox>
+
+
+
+ </vbox>
+
+ <vbox id="CompactHeader_dispMUA2line">
- <image id="CompactHeader_dispMUAicon2line"
++ <image id="CompactHeader_dispMUAicon2line" observes="dispMUAicon"
+ tooltiptext=""
+ style="width:32px; height:32px; margin-left:2px; margin-right:2px;"
+ onclick="dispMUA.infopopup();"/>
+ </vbox>
+
+ <vbox id="CompactHeader_dispMUAcompact">
- <image id="CompactHeader_dispMUAiconCompact"
++ <image id="CompactHeader_dispMUAiconCompact" observes="dispMUAicon"
+ tooltiptext=""
+ style="width:24px; height:24px; margin:-2px 2px -2px 2px;"
+ onclick="dispMUA.infopopup();"/>
+ </vbox>
+
+
+ </vbox>
+
+ </deck>
+
+</overlay>
+
+<!--
+-->
diff --cc chrome/CompactHeader/content/compactHeaderOverlay.xul
index 0ce4f4f,1b17fe8..063ed84
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@@ -120,10 -122,8 +120,10 @@@
</vbox>
- <vbox id="dispMUAexp" collapsed="false">
- <image id="dispMUAiconExp" observes="dispMUAicon" tooltiptext="" style="width:48px; height:48px; margin-left:2px; margin-right:2px;" onclick="dispMUA.infopopup();"/>
+ <vbox id="CompactHeader_dispMUAexp" collapsed="false">
- <image id="CompactHeader_dispMUAiconExp" tooltiptext=""
++ <image id="CompactHeader_dispMUAiconExp" observes="dispMUAicon" tooltiptext=""
+ style="width:48px; height:48px; margin-left:2px; margin-right:2px;"
+ onclick="dispMUA.infopopup();"/>
</vbox>
</vbox>
@@@ -215,18 -228,12 +215,18 @@@
</vbox>
- <vbox id="dispMUA2line">
- <image id="dispMUAicon2line" observes="dispMUAicon" tooltiptext="" style="width:32px; height:32px; margin-left:2px; margin-right:2px;" onclick="dispMUA.infopopup();"/>
+ <vbox id="CompactHeader_dispMUA2line">
- <image id="CompactHeader_dispMUAicon2line"
++ <image id="CompactHeader_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="dispMUAicon" tooltiptext="" style="width:24px; height:24px; margin:-2px 2px -2px 2px;" onclick="dispMUA.infopopup();"/>
+ <vbox id="CompactHeader_dispMUAcompact">
- <image id="CompactHeader_dispMUAiconCompact"
++ <image id="CompactHeader_dispMUAiconCompact" observes="dispMUAicon"
+ tooltiptext=""
+ style="width:24px; height:24px; margin:-2px 2px -2px 2px;"
+ onclick="dispMUA.infopopup();"/>
</vbox>
diff --cc chrome/CompactHeader/content/toolbar.js
index b2382b6,507d17b..3bad02d
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@@ -241,15 -243,16 +241,16 @@@ org.mozdev.compactHeader.toolbar = func
hdrToolbar.lastPermanentChild = lastPermanentChild;
}
}
- pub.onChangeDispMUAicon();
++ pub.onChangeDispMUAicon(); // XXX Check if necessary
org.mozdev.compactHeader.debug.log("toolbar toggle stop");
};
pub.dispMUACheck = function() {
org.mozdev.compactHeader.debug.log("dispMUACheck start");
- var dispMUAButton = document.getElementById("button-dispMUA");
+ var dispMUAButton = document.getElementById("CompactHeader_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 */
@@@ -304,51 -307,77 +305,44 @@@
org.mozdev.compactHeader.debug.log("dispMUACheck stop");
};
- pub.onChangeDispMUAicon = function(attribute) {
- if (attribute == "src") {
- org.mozdev.compactHeader.debug.log("onChangeDispMUAicon start");
- var imageSrc = document.getElementById("button-dispMUA").getAttribute("src");
- var IconContainerDispMUA = null;
- /* toolbar button */
- if (IconContainerDispMUA = document.getElementById("button-dispMUA")) {
- IconContainerDispMUA.setAttribute("image", imageSrc);
- }
- org.mozdev.compactHeader.debug.log("onChangeDispMUAicon stop");
- }
- };
-
- pub.onDoCustomizationHeaderViewToolbox = function(event) {
- if (event.attrName == "doCustomization") {
- org.mozdev.compactHeader.debug.log("onDoCustomizationHeaderViewToolbox start" + event);
- 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");
+ pub.onChangeDispMUAicon = function() {
+ org.mozdev.compactHeader.debug.log("onChangeDispMUAicon start");
- var imageSrc = document.getElementById("dispMUAicon").getAttribute("src");
+ var IconContainerDispMUA = null;
+ /* toolbar button */
+ if (IconContainerDispMUA = document.getElementById("CompactHeader_button-dispMUA")) {
+ IconContainerDispMUA.setAttribute("image", imageSrc);
}
- /* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconExp")) {
- IconContainerDispMUA.setAttribute("src", imageSrc);
- }
- /* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAicon2line")) {
- IconContainerDispMUA.setAttribute("src", imageSrc);
- }
- /* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconCompact")) {
- IconContainerDispMUA.setAttribute("src", imageSrc);
- }
- org.mozdev.compactHeader.debug.log("onChangeDispMUAicon 1");
- var tooltipText = document.getElementById("dispMUAicon").getAttribute("tooltiptext");
- var buttonDispMUA = document.getElementById("CompactHeader_button-dispMUA");
- if (buttonDispMUA) {
- buttonDispMUA.setAttribute("tooltiptext", tooltipText);
- }
- /* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconExp")) {
- IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
- }
- /* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAicon2line")) {
- IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
- }
- /* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("CompactHeader_dispMUAiconCompact")) {
- IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
- }
+ org.mozdev.compactHeader.debug.log("onChangeDispMUAicon stop");
};
- function removeButtonDispMUA() {
+ 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");
if (!document.getElementById("dispMUA")) {
- var button = document.getElementById("button-dispMUA");
+ var button = document.getElementById("CompactHeader_button-dispMUA");
if (button) {
button.parentNode.removeChild(button);
}
--
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