[Pkg-mozext-commits] [compactheader] 225/441: Use javascript modules.
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 b3a510ec4fb126c082db34d83dc5d7f41fc0727c
Author: joachim <none at none>
Date: Sat Jul 23 16:59:10 2011 +0200
Use javascript modules.
--HG--
branch : B_DispMUA
---
.../content/{RSSLinkify.js => RSSLinkify.jsm} | 39 ++---
.../CompactHeader/content/compactHeaderOverlay.js | 54 ++-----
.../CompactHeader/content/compactHeaderOverlay.xul | 37 +++--
.../content/customizeToolbarOverlay.xul | 5 +-
.../CompactHeader/content/{debug.js => debug.jsm} | 8 +-
.../content/{toolbar.js => toolbar.jsm} | 160 ++++++++++++---------
6 files changed, 149 insertions(+), 154 deletions(-)
diff --git a/chrome/CompactHeader/content/RSSLinkify.js b/chrome/CompactHeader/content/RSSLinkify.jsm
similarity index 89%
rename from chrome/CompactHeader/content/RSSLinkify.js
rename to chrome/CompactHeader/content/RSSLinkify.jsm
index 8b9ec2d..de3a4d2 100644
--- a/chrome/CompactHeader/content/RSSLinkify.js
+++ b/chrome/CompactHeader/content/RSSLinkify.jsm
@@ -38,29 +38,31 @@
# ***** END LICENSE BLOCK *****
*/
-EXPORTED_SYMBOLS = ["org"];
-
-//Components.utils.import("chrome://CompactHeader/content/debug.jsm");
+EXPORTED_SYMBOLS = ["RSSLinkify"];
if(!org) var org={};
if(!org.mozdev) org.mozdev={};
if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
+Components.utils.import("chrome://CompactHeader/content/debug.jsm", org.mozdev.compactHeader);
-org.mozdev.compactHeader.RSSLinkify = function() {
+RSSLinkify = function() {
var pub = {};
+ var doc;
var cohePrefBranch = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService)
.getBranch("extensions.CompactHeader.");
+ var doc;
+
var coheIntegrateRSSLinkify = false;
-
+
var RSSLinkify = {
oldSubject: null,
newSubject: null
};
-
+
pub.UpdateHeaderView = function(currentHeaderData) {
org.mozdev.compactHeader.debug.log("updateheaderview start");
if (!currentHeaderData) {
@@ -70,7 +72,7 @@ org.mozdev.compactHeader.RSSLinkify = function() {
if (cohePrefBranch.getBoolPref("headersize.linkify")) {
var url = currentHeaderData["content-base"];
if(url) {
- RSSLinkify.newSubject.setAttribute("onclick", "if (!event.button) messenger.launchExternalURL('" +
+ RSSLinkify.newSubject.setAttribute("onclick", "if (!event.button) messenger.launchExternalURL('" +
url.headerValue + "');");
RSSLinkify.newSubject.setAttribute("value", currentHeaderData["subject"].headerValue);
RSSLinkify.newSubject.setAttribute("url", url.headerValue);
@@ -100,11 +102,12 @@ org.mozdev.compactHeader.RSSLinkify = function() {
org.mozdev.compactHeader.debug.log("updateheaderview stop");
};
- pub.InitializeHeaderViewTables = function() {
+ pub.InitializeHeaderViewTables = function(aDocument) {
+ doc = aDocument;
org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start");
if (cohePrefBranch.getBoolPref("headersize.linkify")) {
org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 1");
- RSSLinkify.newSubject = document.getElementById("collapsedsubjectlinkBox") || document.createElement("label");
+ RSSLinkify.newSubject = doc.getElementById("collapsedsubjectlinkBox") || doc.createElement("label");
org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 2");
RSSLinkify.newSubject.setAttribute("id", "collapsedsubjectlinkBox");
RSSLinkify.newSubject.setAttribute("class", "headerValue plain headerValueUrl");
@@ -116,9 +119,9 @@ org.mozdev.compactHeader.RSSLinkify = function() {
RSSLinkify.newSubject.setAttribute("flex", "1");
org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 3");
if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
- RSSLinkify.oldSubject = document.getElementById("collapsed2LsubjectBox");
+ RSSLinkify.oldSubject = doc.getElementById("collapsed2LsubjectBox");
} else {
- RSSLinkify.oldSubject = document.getElementById("collapsed1LsubjectBox");
+ RSSLinkify.oldSubject = doc.getElementById("collapsed1LsubjectBox");
}
org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 3");
RSSLinkify.oldSubject.parentNode.insertBefore(RSSLinkify.newSubject, RSSLinkify.oldSubject);
@@ -128,7 +131,7 @@ org.mozdev.compactHeader.RSSLinkify = function() {
};
function linkifySubject(subjectValueStr) {
- var subjectNode = document.getElementById(subjectValueStr);
+ var subjectNode = doc.getElementById(subjectValueStr);
while(subjectNode.childNodes.length > 0) {
subjectNode.removeChild(subjectNode.firstChild)
}
@@ -141,8 +144,8 @@ org.mozdev.compactHeader.RSSLinkify = function() {
var matches = regex.links.exec(text);
var pre, post = null;
[pre, post] = text.split(matches[1]);
- var link = document.createElement("a");
- link.appendChild(document.createTextNode(matches[1]));
+ var link = doc.createElement("a");
+ link.appendChild(doc.createTextNode(matches[1]));
link.setAttribute("href", matches[1]);
link.setAttribute("class","text-link");
link.setAttribute("onclick", "org.mozdev.compactHeader.pane.subjectLinkOnClickListenter(event);");
@@ -154,14 +157,14 @@ org.mozdev.compactHeader.RSSLinkify = function() {
[pre,link,post] = linkify(text);
/* we can't assume that any pre or post text was given, only a link */
if (pre && pre.length > 0)
- subjectNode.appendChild(document.createTextNode(pre));
+ subjectNode.appendChild(doc.createTextNode(pre));
subjectNode.appendChild(link);
text = post;
}
if (text && text.length > 0)
- subjectNode.appendChild(document.createTextNode(text));
+ subjectNode.appendChild(doc.createTextNode(text));
} else {
- subjectNode.appendChild(document.createTextNode(subject));
+ subjectNode.appendChild(doc.createTextNode(subject));
}
}
@@ -179,7 +182,7 @@ org.mozdev.compactHeader.RSSLinkify = function() {
if (websiteAddressNode)
{
var websiteAddress = websiteAddressNode.getAttribute("url");
-
+
var contractid = "@mozilla.org/widget/clipboardhelper;1";
var iid = Components.interfaces.nsIClipboardHelper;
var clipboard = Components.classes[contractid].getService(iid);
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 5194333..8780bc2 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -55,9 +55,9 @@ if(!org) var org={};
if(!org.mozdev) org.mozdev={};
if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
-//Components.utils.import("chrome://CompactHeader/content/RSSLinkify.jsm");
-//Components.utils.import("chrome://CompactHeader/content/debug.jsm");
-//Components.utils.import("chrome://CompactHeader/content/toolbar.jsm");
+Components.utils.import("chrome://CompactHeader/content/RSSLinkify.jsm", org.mozdev.compactHeader);
+Components.utils.import("chrome://CompactHeader/content/debug.jsm", org.mozdev.compactHeader);
+Components.utils.import("chrome://CompactHeader/content/toolbar.jsm", org.mozdev.compactHeader);
org.mozdev.compactHeader.pane = function() {
var pub = {};
@@ -181,7 +181,7 @@ org.mozdev.compactHeader.pane = function() {
}
}
- org.mozdev.compactHeader.RSSLinkify.InitializeHeaderViewTables();
+ org.mozdev.compactHeader.RSSLinkify.InitializeHeaderViewTables(document);
}
pub.coheOnLoadMsgHeaderPane = function() {
@@ -203,19 +203,19 @@ org.mozdev.compactHeader.pane = function() {
var headerViewToolbox = document.getElementById("header-view-toolbox");
if (headerViewToolbox) {
- headerViewToolbox.addEventListener("DOMAttrModified",
- onDoCustomizationHeaderViewToolbox, false);
+ headerViewToolbox.addEventListener("DOMAttrModified",
+ org.mozdev.compactHeader.toolbar.onDoCustomizationHeaderViewToolbox, false);
}
-
+
var mailToolbox = document.getElementById("mail-toolbox");
if (mailToolbox) {
- mailToolbox.addEventListener("DOMAttrModified",
- onDoCustomizationHeaderViewToolbox, false);
+ mailToolbox.addEventListener("DOMAttrModified",
+ org.mozdev.compactHeader.toolbar.onDoCustomizationHeaderViewToolbox, false);
}
var dispMUAicon = document.getElementById("dispMUAicon");
if (dispMUAicon) {
- dispMUAicon.addEventListener("DOMAttrModified",
- org.mozdev.compactHeader.toolbar.onChangeDispMUAicon, false);
+ dispMUAicon.addEventListener("DOMAttrModified",
+ org.mozdev.compactHeader.toolbar.onChangeDispMUAicon, false);
}
// work around XUL deck bug where collapsed header view, if it's the persisted
@@ -239,7 +239,7 @@ org.mozdev.compactHeader.pane = function() {
coheFirstTime = false;
gMessageListeners.push(coheMessageListener);
org.mozdev.customizeHeaderToolbar.messenger.loadToolboxData();
- org.mozdev.compactHeader.toolbar.fillToolboxPalette();
+ org.mozdev.compactHeader.toolbar.fillToolboxPalette(document);
org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
var toolbox = document.getElementById("header-view-toolbox");
toolbox.customizeDone = function(aEvent) {
@@ -328,36 +328,6 @@ org.mozdev.compactHeader.pane = function() {
});
}
- 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()
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index fd01513..f495177 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -1,8 +1,8 @@
<?xml version="1.0" ?>
<!DOCTYPE overlay [
- <!ENTITY % msgHeaderDTD SYSTEM
- "chrome://messenger/locale/msgHdrViewOverlay.dtd">
+ <!ENTITY % msgHeaderDTD SYSTEM
+ "chrome://messenger/locale/msgHdrViewOverlay.dtd">
%msgHeaderDTD;
<!ENTITY % compactHeaderDTD SYSTEM
"chrome://CompactHeader/locale/CompactHeader.dtd">
@@ -21,23 +21,20 @@
<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/x-javascript"
+ <script type="application/x-javascript"
src="chrome://CompactHeader/content/CHTMessenger.js"/>
<script type="application/javascript" src="chrome://CompactHeader/content/buttonsOverlay.js"/>
<keyset>
- <key id="hideDetailsKey"
- modifiers="shift"
+ <key id="hideDetailsKey"
+ modifiers="shift"
key="&toggleDetails.key;"
oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
</keyset>
<menupopup id="header-toolbar-context-menu">
- <menuitem id="hidecohePreferencesButton"
+ <menuitem id="hidecohePreferencesButton"
label="&dialog.title;"
oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,resizable=no,centerscreen,modal');"/>
</menupopup>
@@ -46,9 +43,9 @@
<vbox id="expandedHeaderView" orient="horizontal">
<vbox id="hideDetailsButtonBox" insertbefore="expandedHeadersBox">
- <button id="hideDetailsButton"
+ <button id="hideDetailsButton"
tooltiptext="&hideDetailsButton.label;"
- onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+ onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
class="msgHeaderView-flat-button"/>
</vbox>
@@ -57,7 +54,7 @@
<label id="CoheShowDetailsLabel" value="&showDetailsButton.label;"/>
</hbox>
- <vbox id="expandedHeadersBox">
+ <vbox id="expandedHeadersBox">
<hbox id="expandedHeadersTopBox" flex="1">
<toolbox id="header-view-toolbox"
mode="icons"
@@ -78,7 +75,7 @@
<hbox id="expandedHeadersBottomBox">
-
+
<vbox id="otherActionsBox" flex="0">
<hbox id="dateValueBox" flex="0"/>
<button type="menu" id="otherActionsButton" collapsed="true"
@@ -109,17 +106,17 @@
</menupopup>
</menu>
<menuseparator id="otherActionPopupAfterViewSource"/>
- <menuitem id="hideDetailsMenu"
+ <menuitem id="hideDetailsMenu"
label="&hideDetailsButton.label;"
oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
- <menuitem id="hidecohePreferencesButton"
+ <menuitem id="hidecohePreferencesButton"
label="&dialog.title;"
oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,centerscreen,dependent,all,resizable=no');"/>
</menupopup>
</button>
</vbox>
</hbox>
-
+
</vbox>
<vbox id="dispMUAexp" collapsed="false">
@@ -165,7 +162,7 @@
<column flex="1"/>
</columns>
<row id="collapsed1LtoCcBccRow" align="baseline">
- <label id="collapsed1LtoCcBccLabel" class="headerName"
+ <label id="collapsed1LtoCcBccLabel" class="headerName"
value="&toField2.label;" control="collapsed1LtoCcBccBox"/>
<mail-multi-emailHeaderField id="collapsed1LtoCcBccBox" flex="1"/>
</row>
@@ -175,7 +172,7 @@
<row id="collapsed1LdateRow">
<label id="collapsed1LdateBox" class="dateLabel" flex="1"/>
</row>
- </hbox>
+ </hbox>
<header-view-button-box id="collapsed1LButtonBox" flex="0" align="start" hidden="true"/>
</hbox>
<hbox id="collapsed1LHeaderViewSecondLine" align="top" flex="1" collapsed="true">
@@ -203,7 +200,7 @@
</columns>
<rows>
<row id="collapsed2LtoCcBccRow" align="baseline">
- <label id="collapsed2LtoCcBccLabel" class="headerName"
+ <label id="collapsed2LtoCcBccLabel" class="headerName"
value="&toField2.label;" control="collapsed2LtoCcBccBox"/>
<mail-multi-emailHeaderField id="collapsed2LtoCcBccBox" flex="1"/>
</row>
@@ -243,5 +240,5 @@
</overlay>
-<!--
+<!--
-->
\ No newline at end of file
diff --git a/chrome/CompactHeader/content/customizeToolbarOverlay.xul b/chrome/CompactHeader/content/customizeToolbarOverlay.xul
index 39aef22..daedb74 100644
--- a/chrome/CompactHeader/content/customizeToolbarOverlay.xul
+++ b/chrome/CompactHeader/content/customizeToolbarOverlay.xul
@@ -2,7 +2,7 @@
<!DOCTYPE overlay [
<!ENTITY % customizeToolbarDTD SYSTEM "chrome://global/locale/customizeToolbar.dtd">
- %customizeToolbarDTD;
+ %customizeToolbarDTD;
]>
<?xml-stylesheet href="chrome://CompactHeader-os/skin/osdef.css" type="text/css"?>
@@ -10,9 +10,6 @@
<overlay id="customizeToolbarOverlay"
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"/>
</overlay>
diff --git a/chrome/CompactHeader/content/debug.js b/chrome/CompactHeader/content/debug.jsm
similarity index 93%
rename from chrome/CompactHeader/content/debug.js
rename to chrome/CompactHeader/content/debug.jsm
index 9808b2a..5210efa 100644
--- a/chrome/CompactHeader/content/debug.js
+++ b/chrome/CompactHeader/content/debug.jsm
@@ -38,13 +38,9 @@
# ***** END LICENSE BLOCK *****
*/
-EXPORTED_SYMBOLS = ["org"];
+EXPORTED_SYMBOLS = ["debug"];
-if(!org) var org={};
-if(!org.mozdev) org.mozdev={};
-if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
-
-org.mozdev.compactHeader.debug = function() {
+debug = function() {
var pub = {};
var cohePrefBranch = Components.classes["@mozilla.org/preferences-service;1"]
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.jsm
similarity index 75%
rename from chrome/CompactHeader/content/toolbar.js
rename to chrome/CompactHeader/content/toolbar.jsm
index ff2b920..ba24b43 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.jsm
@@ -38,32 +38,34 @@
# ***** END LICENSE BLOCK *****
*/
-EXPORTED_SYMBOLS = ["org"];
-
-//Components.utils.import("chrome://CompactHeader/content/debug.jsm");
+EXPORTED_SYMBOLS = ["toolbar"];
if(!org) var org={};
if(!org.mozdev) org.mozdev={};
if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
+Components.utils.import("chrome://CompactHeader/content/debug.jsm", org.mozdev.compactHeader);
+
-org.mozdev.compactHeader.toolbar = function() {
+toolbar = function() {
var pub = {};
+ var doc;
var cohePrefBranch = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService)
.getBranch("extensions.CompactHeader.");
- pub.fillToolboxPalette = function () {
+ pub.fillToolboxPalette = function (aDocument) {
+ doc = aDocument;
org.mozdev.compactHeader.debug.log("fillToolboxPalette start");
removeButtonDispMUA();
- var hdrToolbar = document.getElementById("header-view-toolbar");
- var hdrToolbox = document.getElementById("header-view-toolbox");
- var buttons = ["button-reply", "button-replyall", "button-replylist",
+ var hdrToolbar = doc.getElementById("header-view-toolbar");
+ var hdrToolbox = doc.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-newmsg", "button-goback", "button-goforward",
- "button-previous", "button-next", "button-compact",
+ "button-previous", "button-next", "button-compact",
"button-address", "button-stop", "button-getmsg",
"button-getPartialMessages",
"stylish-toolbar-button",
@@ -81,8 +83,8 @@ org.mozdev.compactHeader.toolbar = function() {
hdrToolbar.currentSet = currentSet;
for (var i=0; i<buttons.length; i++) {
var buttonName = buttons[i];
- var button = document.getElementById(buttonName) ||
- document.getElementById("mail-toolbox").palette.getElementsByAttribute("id", buttonName)[0];
+ var button = doc.getElementById(buttonName) ||
+ doc.getElementById("mail-toolbox").palette.getElementsByAttribute("id", buttonName)[0];
if (button) {
var hdrButton = button.cloneNode(true);
if (hdrButton) {
@@ -100,7 +102,7 @@ org.mozdev.compactHeader.toolbar = function() {
}
//hdrButton.id = "hdr" + hdrButton.id;
hdrToolbox.palette.appendChild(hdrButton);
- /* var bStyle = document.defaultView.getComputedStyle(button, null);
+ /* var bStyle = doc.defaultView.getComputedStyle(button, null);
hdrButton.style.listStyleImage = bStyle.listStyleImage;*/
}
if (currentSet.indexOf(buttonName)>=0) {
@@ -116,21 +118,21 @@ org.mozdev.compactHeader.toolbar = function() {
//"hdrReplyAllButton", "hdrReplyListButton"];
for (var i=0; i<buttonsRemove.length; i++) {
var buttonName = buttonsRemove[i];
- var button = document.getElementById(buttonName) ||
- document.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", buttonName)[0];
+ var button = doc.getElementById(buttonName) ||
+ doc.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", buttonName)[0];
if (button) {
button.setAttribute("collapsed", "true");
}
}
-
+
var target = "hdrOtherActionsButton";
-
- var newParent = document.getElementById(target) ||
- document.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", target)[0];
-
+
+ var newParent = doc.getElementById(target) ||
+ doc.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", target)[0];
+
if (newParent != null) {
var myElement;
- myElement= document.getElementById("otherActionsPopup");
+ myElement= doc.getElementById("otherActionsPopup");
if (myElement) {
newParent.appendChild(myElement);
}
@@ -140,8 +142,8 @@ org.mozdev.compactHeader.toolbar = function() {
pub.setButtonStyle = function() {
org.mozdev.compactHeader.debug.log("setButtonStyle start");
- var hdrToolbar = document.getElementById("header-view-toolbar");
- var hdrToolbox = document.getElementById("header-view-toolbox");
+ var hdrToolbar = doc.getElementById("header-view-toolbar");
+ var hdrToolbox = doc.getElementById("header-view-toolbox");
var buttons = hdrToolbar.querySelectorAll("toolbarbutton");
for (var i=0; i<buttons.length; i++) {
var button = buttons[i];
@@ -187,7 +189,7 @@ org.mozdev.compactHeader.toolbar = function() {
}
}
}
-
+
buttons = hdrToolbox.palette.querySelectorAll("toolbarbutton");
for (var i=0; i<buttons.length; i++) {
var button = buttons[i];
@@ -234,17 +236,17 @@ org.mozdev.compactHeader.toolbar = function() {
}
org.mozdev.compactHeader.debug.log("setButtonStyle stop");
};
-
+
pub.toggle = function(aHeaderViewMode) {
org.mozdev.compactHeader.debug.log("toolbar toggle start");
- 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 hdrToolbox = doc.getElementById("header-view-toolbox");
+ var hdrToolbar = doc.getElementById("header-view-toolbar");
+ var strHideLabel = doc.getElementById("CoheHideDetailsLabel").value;
+ var strShowLabel = doc.getElementById("CoheShowDetailsLabel").value;
var firstPermanentChild = hdrToolbar.firstPermanentChild;
var lastPermanentChild = hdrToolbar.lastPermanentChild;
if (aHeaderViewMode) {
- var cBox = document.getElementById("collapsed2LButtonBox");
+ var cBox = doc.getElementById("collapsed2LButtonBox");
if (cBox.parentNode.id != hdrToolbox.parentNode.id) {
var cloneToolboxPalette;
var cloneToolbarset;
@@ -257,12 +259,12 @@ org.mozdev.compactHeader.toolbar = function() {
cBox.parentNode.insertBefore(hdrToolbox, cBox);
hdrToolbox.palette = cloneToolboxPalette;
hdrToolbox.toolbarset = cloneToolbarset;
- hdrToolbar = document.getElementById("header-view-toolbar");
+ hdrToolbar = doc.getElementById("header-view-toolbar");
hdrToolbar.firstPermanentChild = firstPermanentChild;
hdrToolbar.lastPermanentChild = lastPermanentChild;
}
} else {
- var cBox = document.getElementById("expandedHeaders");
+ var cBox = doc.getElementById("expandedHeaders");
if (cBox.parentNode.id != hdrToolbox.parentNode.id) {
var cloneToolboxPalette;
var cloneToolbarset;
@@ -275,7 +277,7 @@ org.mozdev.compactHeader.toolbar = function() {
cBox.parentNode.appendChild(hdrToolbox);
hdrToolbox.palette = cloneToolboxPalette;
hdrToolbox.toolbarset = cloneToolbarset;
- hdrToolbar = document.getElementById("header-view-toolbar");
+ hdrToolbar = doc.getElementById("header-view-toolbar");
hdrToolbar.firstPermanentChild = firstPermanentChild;
hdrToolbar.lastPermanentChild = lastPermanentChild;
}
@@ -285,21 +287,21 @@ org.mozdev.compactHeader.toolbar = function() {
pub.dispMUACheck = function() {
org.mozdev.compactHeader.debug.log("dispMUACheck start");
- var dispMUAButton = document.getElementById("button-dispMUA");
- var dispMUABox = document.getElementById("dispMUA");
+ var dispMUAButton = doc.getElementById("button-dispMUA");
+ var dispMUABox = doc.getElementById("dispMUA");
dispMUABox.setAttribute("collapsed", "true"); // hide original
var IconContainerDispMUA = null;
if (dispMUAButton) {
/* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ if (IconContainerDispMUA = doc.getElementById("dispMUAiconExp")) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
/* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
+ if (IconContainerDispMUA = doc.getElementById("dispMUAicon2line")) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
/* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
+ if (IconContainerDispMUA = doc.getElementById("dispMUAiconCompact")) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
@@ -307,21 +309,21 @@ org.mozdev.compactHeader.toolbar = function() {
else if (dispMUABox){
/* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ if (IconContainerDispMUA = doc.getElementById("dispMUAiconExp")) {
IconContainerDispMUA.removeAttribute("collapsed");
}
if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
/* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line"))
+ if (IconContainerDispMUA = doc.getElementById("dispMUAicon2line"))
IconContainerDispMUA.removeAttribute("collapsed");
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact"))
+ if (IconContainerDispMUA = doc.getElementById("dispMUAiconCompact"))
IconContainerDispMUA.setAttribute("collapsed", "true");
}
else {
/* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact"))
+ if (IconContainerDispMUA = doc.getElementById("dispMUAiconCompact"))
IconContainerDispMUA.removeAttribute("collapsed");
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line"))
+ if (IconContainerDispMUA = doc.getElementById("dispMUAicon2line"))
IconContainerDispMUA.setAttribute("collapsed", "true");
}
}
@@ -331,92 +333,122 @@ org.mozdev.compactHeader.toolbar = function() {
pub.onChangeDispMUAicon = function(event) {
if (event.attrName == "src") {
org.mozdev.compactHeader.debug.log("onChangeDispMUAicon start");
- var imageSrc = document.getElementById("dispMUAicon").getAttribute("src");
+ var imageSrc = doc.getElementById("dispMUAicon").getAttribute("src");
var IconContainerDispMUA = null;
/* toolbar button */
- if (IconContainerDispMUA = document.getElementById("button-dispMUA")) {
+ if (IconContainerDispMUA = doc.getElementById("button-dispMUA")) {
IconContainerDispMUA.setAttribute("image", imageSrc);
}
/* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ if (IconContainerDispMUA = doc.getElementById("dispMUAiconExp")) {
IconContainerDispMUA.setAttribute("src", imageSrc);
}
/* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
+ if (IconContainerDispMUA = doc.getElementById("dispMUAicon2line")) {
IconContainerDispMUA.setAttribute("src", imageSrc);
}
/* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
+ if (IconContainerDispMUA = doc.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 tooltipText = document.getElementById("dispMUAicon").getAttribute("tooltiptext");
- var buttonDispMUA = document.getElementById("button-dispMUA");
+ var tooltipText = doc.getElementById("dispMUAicon").getAttribute("tooltiptext");
+ var buttonDispMUA = doc.getElementById("button-dispMUA");
if (buttonDispMUA) {
buttonDispMUA.setAttribute("tooltiptext", tooltipText);
}
/* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ if (IconContainerDispMUA = doc.getElementById("dispMUAiconExp")) {
IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
}
/* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
+ if (IconContainerDispMUA = doc.getElementById("dispMUAicon2line")) {
IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
}
/* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
+ if (IconContainerDispMUA = doc.getElementById("dispMUAiconCompact")) {
IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
}
org.mozdev.compactHeader.debug.log("onChangeDispMUAicon stop");
}
};
-
+
// function onChangeHeaderToolbar(event) {
// if (event.attrName == "currentset") {
-// if (document.getElementById("button-dispMUA")) {
+// if (doc.getElementById("button-dispMUA")) {
// gDBView.reloadMessage();
// }
// dispMUACheck();
// org.mozdev.compactHeader.buttons.coheToggleStar();
// }
// }
-
+
removeButtonDispMUA = function() {
org.mozdev.compactHeader.debug.log("removeButtonDispMUA start");
- if (!document.getElementById("dispMUA")) {
- var button = document.getElementById("button-dispMUA");
+ if (!doc.getElementById("dispMUA")) {
+ var button = doc.getElementById("button-dispMUA");
if (button) {
button.parentNode.removeChild(button);
}
-
- var button1 = document.getElementById("mail-toolbox").palette.getElementsByAttribute("id", "button-dispMUA")[0];
+
+ var button1 = doc.getElementById("mail-toolbox").palette.getElementsByAttribute("id", "button-dispMUA")[0];
if (button1) {
button1.parentNode.removeChild(button1);
}
- var button2 = document.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", "button-dispMUA")[0];
+ var button2 = doc.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", "button-dispMUA")[0];
if (button2) {
button2.parentNode.removeChild(button2);
}
}
org.mozdev.compactHeader.debug.log("removeButtonDispMUA stop");
};
-
+
+ pub.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");
+ }
+ };
+
function addClass(el, strClass) {
- var testnew = new RegExp('\\b'+strClass+'\\b').test(el.className);
+ var testnew = new RegExp('\\b'+strClass+'\\b').test(el.className);
if (!testnew) {
el.className += el.className?' '+strClass:strClass;
}
}
-
+
function removeClass(el, strClass) {
var str = new RegExp('(\\s|^)'+strClass+'(\\s|$)', 'g');
el.className = el.className.replace(str, ' ');
}
-
+
return pub;
}();
--
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