[Pkg-mozext-commits] [compactheader] 431/441: Use unique variable name for name spacing.
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:25 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 bfea4918c2a656b17c823fb8f38f14364ff67078
Author: jmozmoz <Joachim.Herb at gmx.de>
Date: Thu Jan 15 00:31:52 2015 +0100
Use unique variable name for name spacing.
---
chrome/CompactHeader/content/CHTMessenger.js | 13 +-
chrome/CompactHeader/content/RSSLinkify.js | 36 +--
chrome/CompactHeader/content/buttonsOverlay.js | 11 +-
chrome/CompactHeader/content/buttonsOverlay.xul | 2 +-
.../CompactHeader/content/compactHeaderOverlay.js | 258 ++++++++-------------
.../CompactHeader/content/compactHeaderOverlay.xul | 18 +-
chrome/CompactHeader/content/debug.js | 10 +-
chrome/CompactHeader/content/toolbar.js | 136 +++++------
install.rdf | 4 +-
9 files changed, 220 insertions(+), 268 deletions(-)
diff --git a/chrome/CompactHeader/content/CHTMessenger.js b/chrome/CompactHeader/content/CHTMessenger.js
index 9aa50f4..29ba693 100644
--- a/chrome/CompactHeader/content/CHTMessenger.js
+++ b/chrome/CompactHeader/content/CHTMessenger.js
@@ -38,11 +38,12 @@
# ***** END LICENSE BLOCK *****
*/
-if(org === "undefined" || !org) var org = {};
-if(!org.mozdev) org.mozdev={};
-if(!org.mozdev.customizeHeaderToolbar) org.mozdev.customizeHeaderToolbar = {};
+if (typeof org_mozdev_compactHeader == "undefined") {
+ var org_mozdev_compactHeader = {};
+};
-org.mozdev.customizeHeaderToolbar.messenger = function(){
+
+org_mozdev_compactHeader.messenger = function(){
var pub = {};
// pub.init = function () {
@@ -50,7 +51,7 @@ org.mozdev.customizeHeaderToolbar.messenger = function(){
// if (onLoadFkt) {
// var strTest = new RegExp('OnLoadMessenger', 'g');;
// onLoadFkt = onLoadFkt.replace(strTest,
-// "org.mozdev.customizeHeaderToolbar.messenger.CHTLoadMessenger");
+// "org_mozdev_compactHeader.messenger.CHTLoadMessenger");
// document.getElementById("messengerWindow").setAttribute("onload", onLoadFkt);
// }
// }
@@ -113,4 +114,4 @@ org.mozdev.customizeHeaderToolbar.messenger = function(){
return pub;
}();
-//org.mozdev.customizeHeaderToolbar.messenger.init();
+//org_mozdev_compactHeader.messenger.init();
diff --git a/chrome/CompactHeader/content/RSSLinkify.js b/chrome/CompactHeader/content/RSSLinkify.js
index 6fdd18c..d707e94 100644
--- a/chrome/CompactHeader/content/RSSLinkify.js
+++ b/chrome/CompactHeader/content/RSSLinkify.js
@@ -40,12 +40,12 @@
//Components.utils.import("chrome://CompactHeader/content/debug.jsm");
-if(org === "undefined" || !org) var org = {};
-if(!org.mozdev) org.mozdev={};
-if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
+if (typeof org_mozdev_compactHeader == "undefined") {
+ var org_mozdev_compactHeader = {};
+};
-org.mozdev.compactHeader.RSSLinkify = function() {
+org_mozdev_compactHeader.RSSLinkify = function() {
var pub = {};
var cohePrefBranch = Components.classes["@mozilla.org/preferences-service;1"]
@@ -60,9 +60,9 @@ org.mozdev.compactHeader.RSSLinkify = function() {
};
pub.UpdateHeaderView = function(currentHeaderData) {
- org.mozdev.compactHeader.debug.log("updateheaderview start");
+ org_mozdev_compactHeader.debug.log("updateheaderview start");
if (!currentHeaderData) {
- org.mozdev.compactHeader.debug.log("updateheaderview: no currentHeaderData!");
+ org_mozdev_compactHeader.debug.log("updateheaderview: no currentHeaderData!");
return;
}
if (cohePrefBranch.getBoolPref("headersize.linkify")) {
@@ -77,11 +77,11 @@ org.mozdev.compactHeader.RSSLinkify = function() {
RSSLinkify.oldSubject.setAttribute("collapsed", "true");
RSSLinkify.newSubject.setAttribute("tooltiptext", url.headerValue);
RSSLinkify.newSubject.addEventListener("click",
- org.mozdev.compactHeader.RSSLinkify.openBrowser, false);
+ org_mozdev_compactHeader.RSSLinkify.openBrowser, false);
RSSLinkify.newSubject.setAttribute("context", "CompactHeader_copyPopup");
} else {
removeEventListener('click',
- org.mozdev.compactHeader.RSSLinkify.openBrowser, true);
+ org_mozdev_compactHeader.RSSLinkify.openBrowser, true);
RSSLinkify.newSubject.setAttribute("collapsed", "true");
RSSLinkify.oldSubject.setAttribute("collapsed", "false");
RSSLinkify.oldSubject.setAttribute("tooltiptext", currentHeaderData["subject"].headerValue);
@@ -101,24 +101,24 @@ org.mozdev.compactHeader.RSSLinkify = function() {
RSSLinkify.oldSubject.setAttribute("tooltiptext", currentHeaderData["subject"].headerValue);
}
}
- org.mozdev.compactHeader.debug.log("updateheaderview stop");
+ org_mozdev_compactHeader.debug.log("updateheaderview stop");
};
pub.openBrowser = function(event) {
- org.mozdev.compactHeader.debug.log("open browser 0" + event.attrName);
+ org_mozdev_compactHeader.debug.log("open browser 0" + event.attrName);
if (!event.button) {
let url = RSSLinkify.newSubject.getAttribute("url");
- org.mozdev.compactHeader.debug.log("open browser 2" + url);
+ org_mozdev_compactHeader.debug.log("open browser 2" + url);
messenger.launchExternalURL(url);
}
};
pub.InitializeHeaderViewTables = function() {
- org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start");
+ org_mozdev_compactHeader.debug.log("rss InitializeHeaderViewTables start");
if (cohePrefBranch.getBoolPref("headersize.linkify")) {
- org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 1");
+ org_mozdev_compactHeader.debug.log("rss InitializeHeaderViewTables start 1");
RSSLinkify.newSubject = document.getElementById("CompactHeader_collapsedsubjectlinkBox") || document.createElement("label");
- org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 2");
+ org_mozdev_compactHeader.debug.log("rss InitializeHeaderViewTables start 2");
RSSLinkify.newSubject.setAttribute("id", "CompactHeader_collapsedsubjectlinkBox");
RSSLinkify.newSubject.setAttribute("class", "headerValue plain headerValueUrl");
RSSLinkify.newSubject.setAttribute("originalclass", "headerValue plain headerValueUrl");
@@ -127,17 +127,17 @@ org.mozdev.compactHeader.RSSLinkify = function() {
RSSLinkify.newSubject.setAttribute("readonly", "true");
RSSLinkify.newSubject.setAttribute("appendoriginalclass", "true");
RSSLinkify.newSubject.setAttribute("flex", "1");
- org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 3");
+ org_mozdev_compactHeader.debug.log("rss InitializeHeaderViewTables start 3");
if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
RSSLinkify.oldSubject = document.getElementById("CompactHeader_collapsed2LsubjectBox");
} else {
RSSLinkify.oldSubject = document.getElementById("CompactHeader_collapsed1LsubjectBox");
}
- org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 3");
+ org_mozdev_compactHeader.debug.log("rss InitializeHeaderViewTables start 3");
RSSLinkify.oldSubject.parentNode.insertBefore(RSSLinkify.newSubject, RSSLinkify.oldSubject);
- org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 4");
+ org_mozdev_compactHeader.debug.log("rss InitializeHeaderViewTables start 4");
}
- org.mozdev.compactHeader.debug.log("InitializeHeaderViewTables stop");
+ org_mozdev_compactHeader.debug.log("InitializeHeaderViewTables stop");
};
function linkifySubject(subjectValueStr) {
diff --git a/chrome/CompactHeader/content/buttonsOverlay.js b/chrome/CompactHeader/content/buttonsOverlay.js
index 28f5131..f9832b1 100644
--- a/chrome/CompactHeader/content/buttonsOverlay.js
+++ b/chrome/CompactHeader/content/buttonsOverlay.js
@@ -38,11 +38,12 @@
# ***** END LICENSE BLOCK *****
*/
-if(org === "undefined" || !org) var org = {};
-if(!org.mozdev) org.mozdev = {};
-if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
+if (typeof org_mozdev_compactHeader == "undefined") {
+ var org_mozdev_compactHeader = {};
+};
-org.mozdev.compactHeader.buttons = function() {
+
+org_mozdev_compactHeader.buttons = function() {
var pub = {};
const MSG_FLAG_FLAGGED = 0x4;
@@ -113,4 +114,4 @@ org.mozdev.compactHeader.buttons = function() {
return pub;
}();
-org.mozdev.compactHeader.buttons.init();
+org_mozdev_compactHeader.buttons.init();
diff --git a/chrome/CompactHeader/content/buttonsOverlay.xul b/chrome/CompactHeader/content/buttonsOverlay.xul
index 269a73b..8f0e1e0 100644
--- a/chrome/CompactHeader/content/buttonsOverlay.xul
+++ b/chrome/CompactHeader/content/buttonsOverlay.xul
@@ -36,7 +36,7 @@
observes="CompactHeader_button_singlemessage"
oncommand="dispMUA.infopopup();">
<observes element="dispMUAbroadcast" attribute="src"
- onbroadcast="org.mozdev.compactHeader.toolbar.onChangeDispMUAicon();"/>
+ onbroadcast="org_mozdev_compactHeader.toolbar.onChangeDispMUAicon();"/>
<observes element="dispMUAbroadcast" attribute="tooltiptext"/>
</toolbarbutton>
</toolbarpalette>
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 7b381e5..ab3d516 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -51,70 +51,14 @@
// view in the message header pane.
////////////////////////////////////////////////////////////////////////////////////
-if(org === "undefined" || !org) var org = {};
-if(!org.mozdev) org.mozdev={};
-if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
-org.mozdev.compactHeader.debug = function() {
- var pub = {};
-
- var cohePrefBranch = Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefService)
- .getBranch("extensions.CompactHeader.");
- var aConsoleService = Components.classes["@mozilla.org/consoleservice;1"]
- .getService(Components.interfaces.nsIConsoleService);
- const { console } = Components.utils.import("resource://gre/modules/devtools/Console.jsm", {});
-
- pub.LOGLEVEL = {"debug": 0, "info":1, "warn": 2, "error": 3};
- var gCurrentLogLevel = pub.LOGLEVEL.info; // TODO: Set to info
-
- pub.log = function(str, logLevel) {
- logLevel = typeof logLevel !== 'undefined' ? logLevel : pub.LOGLEVEL.debug;
- if (logLevel >= gCurrentLogLevel) {
- aConsoleService.logStringMessage(Date() + " CH: " + str);
- Application.console.log(Date() + " CH: " + str);
-// console.log(Date() + " CH: " + str);
- }
- };
-
- pub.setLogLevel = function(logLevel) {
- gCurrentLogLevel = logLevel;
- cohePrefBranch.setIntPref("debugLevel", debugLevel);
- };
-
- pub.getLogLevel = function() {
- try{
- gCurrentLogLevel = cohePrefBranch.getIntPref("debugLevel");
- } catch(e) {
- } finally {
- }
- pub.log("Current logLevel: " + gCurrentLogLevel, pub.LOGLEVEL.error)
- return gCurrentLogLevel;
- };
+if (typeof org_mozdev_compactHeader == "undefined") {
+ var org_mozdev_compactHeader = {};
+};
- return pub;
-}();
-
-//Components.utils.import("chrome://CompactHeader/content/RSSLinkify.jsm");
-//Components.utils.import("chrome://CompactHeader/content/debug.jsm");
-//Components.utils.import("chrome://CompactHeader/content/toolbar.jsm");
-
-org.mozdev.compactHeader.pane = function() {
+org_mozdev_compactHeader.pane = function() {
var pub = {};
- pub.LOGLEVEL = {"debug": 0, "info":1, "warn": 2, "error": 3};
- var gCurrentLogLevel = pub.LOGLEVEL.info; // TODO: Set to info
-
- pub.log = function(str, logLevel) {
- logLevel = typeof logLevel !== 'undefined' ? logLevel : pub.LOGLEVEL.debug;
- if (logLevel >= gCurrentLogLevel) {
- aConsoleService.logStringMessage(Date() + " CH: " + str);
- Application.console.log(Date() + " CH: " + str);
-// console.log(Date() + " CH: " + str);
- }
- };
-
-
const COMPACTHEADER_EXTENSION_UUID = "{58D4392A-842E-11DE-B51A-C7B855D89593}";
// var regex = {
@@ -212,16 +156,16 @@ org.mozdev.compactHeader.pane = function() {
} else {
address.displayName = names.value[index];
}
- pub.log("0: " + address.fullAddress);
- pub.log("0: " + addressType);
+ org_mozdev_compactHeader.debug.log("0: " + address.fullAddress);
+ org_mozdev_compactHeader.debug.log("0: " + addressType);
if (address.fullAddress != "" &&
(addressType == "to" || addressType == "cc" || addressType == "bcc")) {
if (moreTooltip == "") {
moreTooltip = address.fullAddress;
- pub.log("1: " + address.fullAddress);
+ org_mozdev_compactHeader.debug.log("1: " + address.fullAddress);
} else {
moreTooltip = moreTooltip + ", " + address.fullAddress;
- pub.log("2: " + address.fullAddress);
+ org_mozdev_compactHeader.debug.log("2: " + address.fullAddress);
}
}
// window.alert(address);
@@ -232,7 +176,7 @@ org.mozdev.compactHeader.pane = function() {
}
index++;
}
- pub.log("tooltiptext: " + moreTooltip);
+ org_mozdev_compactHeader.debug.log("tooltiptext: " + moreTooltip);
moreButton.setAttribute("tooltiptext", moreTooltip);
gMoreTooltip = moreTooltip;
@@ -249,6 +193,7 @@ org.mozdev.compactHeader.pane = function() {
function coheInitializeHeaderViewTables()
{
+ org_mozdev_compactHeader.debug.log("coheInitializeHeaderViewTables start");
gCoheCollapsedHeaderView = {};
var index;
@@ -274,7 +219,10 @@ org.mozdev.compactHeader.pane = function() {
}
}
- org.mozdev.compactHeader.RSSLinkify.InitializeHeaderViewTables();
+ org_mozdev_compactHeader.debug.log("call to org_mozdev_compactHeader.RSSLinkify.InitializeHeaderViewTables");
+ org_mozdev_compactHeader.RSSLinkify.InitializeHeaderViewTables();
+
+ org_mozdev_compactHeader.debug.log("coheInitializeHeaderViewTables stop");
}
function pressMoreButtons() {
@@ -286,21 +234,21 @@ org.mozdev.compactHeader.pane = function() {
"anonid", "more");
if (!moreButtonTo.hasAttribute("collapsed")) {
moreButtonTo.click();
- pub.log("toggle To");
+ org_mozdev_compactHeader.debug.log("toggle To");
}
if (!moreButtonCC.hasAttribute("collapsed")) {
moreButtonCC.click();
- pub.log("toggle cc");
+ org_mozdev_compactHeader.debug.log("toggle cc");
}
if (!moreButtonBCC.hasAttribute("collapsed")) {
moreButtonBCC.click();
- pub.log("toggle bcc");
+ org_mozdev_compactHeader.debug.log("toggle bcc");
}
pressMores = null;
}
pub.coheOnLoadMsgHeaderPane = function() {
- pub.log("coheOnLoadMsgHeaderPane start");
+ org_mozdev_compactHeader.debug.log("coheOnLoadMsgHeaderPane start");
coheInitializeHeaderViewTables();
@@ -316,7 +264,7 @@ org.mozdev.compactHeader.pane = function() {
gCoheCollapsedHeaderViewMode =
deckHeaderView.selectedPanel == document.getElementById('CompactHeader_collapsedHeaderView');
- pub.log("coheOnLoadMsgHeaderPane 1");
+ org_mozdev_compactHeader.debug.log("coheOnLoadMsgHeaderPane 1");
// 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
@@ -334,16 +282,16 @@ org.mozdev.compactHeader.pane = function() {
document.getElementById('CompactHeader_collapsed2LHeadersBox').collapsed = true;
}
- pub.log("coheOnLoadMsgHeaderPane 2");
+ org_mozdev_compactHeader.debug.log("coheOnLoadMsgHeaderPane 2");
if (coheFirstTime)
{
- pub.log("coheFirstTime");
+ org_mozdev_compactHeader.debug.log("coheFirstTime");
coheFirstTime = false;
gMessageListeners.push(coheMessageListener);
- org.mozdev.customizeHeaderToolbar.messenger.loadToolboxData();
- org.mozdev.compactHeader.toolbar.fillToolboxPalette();
- org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
+ org_mozdev_compactHeader.messenger.loadToolboxData();
+ org_mozdev_compactHeader.toolbar.fillToolboxPalette();
+ org_mozdev_compactHeader.messenger.saveToolboxData();
let collapsed2LtoCcBccBox = document.getElementById("CompactHeader_collapsed2LtoCcBccBox");
if (collapsed2LtoCcBccBox) {
@@ -353,7 +301,7 @@ org.mozdev.compactHeader.pane = function() {
updateEmailAddressNodeFunction(aEmailNode, aAddress);
}
catch(e) {
- pub.log("got execption " + e +
+ org_mozdev_compactHeader.debug.log("got execption " + e +
" from updateEmailAddressNode");
}
aEmailNode.setAttribute("addressType", aAddress.addressType);
@@ -371,23 +319,23 @@ org.mozdev.compactHeader.pane = function() {
}
}
- pub.log("coheOnLoadMsgHeaderPane 2a");
+ org_mozdev_compactHeader.debug.log("coheOnLoadMsgHeaderPane 2a");
if (cohe.firstrun) {
coheCheckFirstRun();
}
- pub.log("coheOnLoadMsgHeaderPane 3");
+ org_mozdev_compactHeader.debug.log("coheOnLoadMsgHeaderPane 3");
- org.mozdev.compactHeader.toolbar.setButtonStyle();
- org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
- org.mozdev.compactHeader.toolbar.dispMUACheck();
+ org_mozdev_compactHeader.toolbar.setButtonStyle();
+ org_mozdev_compactHeader.messenger.saveToolboxData();
+ org_mozdev_compactHeader.toolbar.dispMUACheck();
- pub.log("coheOnLoadMsgHeaderPane 4");
+ org_mozdev_compactHeader.debug.log("coheOnLoadMsgHeaderPane 4");
coheToggleHeaderContent();
- pub.log("coheOnLoadMsgHeaderPane stop");
+ org_mozdev_compactHeader.debug.log("coheOnLoadMsgHeaderPane stop");
}
var coheMessageListener =
@@ -464,17 +412,17 @@ org.mozdev.compactHeader.pane = function() {
if (gCoheCollapsedHeaderViewMode)
showHeaderView(gCoheCollapsedHeaderView);
- org.mozdev.compactHeader.RSSLinkify.UpdateHeaderView(currentHeaderData);
+ org_mozdev_compactHeader.RSSLinkify.UpdateHeaderView(currentHeaderData);
if (cohePrefBranch.getBoolPref("headersize.addressstyle")) {
selectEmailDisplayed();
}
- //org.mozdev.compactHeader.toolbar.fillToolboxPalette(document);
+ //org_mozdev_compactHeader.toolbar.fillToolboxPalette(document);
coheToggleHeaderContent();
- org.mozdev.compactHeader.toolbar.CHTUpdateReplyButton();
- org.mozdev.compactHeader.toolbar.CHTUpdateJunkButton();
- org.mozdev.compactHeader.buttons.coheToggleStar();
+ org_mozdev_compactHeader.toolbar.CHTUpdateReplyButton();
+ org_mozdev_compactHeader.toolbar.CHTUpdateJunkButton();
+ org_mozdev_compactHeader.buttons.coheToggleStar();
}
function enableButtons() {
@@ -488,7 +436,7 @@ org.mozdev.compactHeader.pane = function() {
}
pub.coheToggleHeaderView = function() {
- pub.log("coheToggleHeaderView start");
+ org_mozdev_compactHeader.debug.log("coheToggleHeaderView start");
gCoheCollapsedHeaderViewMode = !gCoheCollapsedHeaderViewMode;
let deck = document.getElementById('msgHeaderViewDeck');
@@ -513,11 +461,11 @@ org.mozdev.compactHeader.pane = function() {
syncGridColumnWidths();
coheToggleHeaderContent();
- pub.log("coheToggleHeaderView stop");
+ org_mozdev_compactHeader.debug.log("coheToggleHeaderView stop");
}
function coheToggleHeaderContent() {
- pub.log("coheToggleHeaderContent start");
+ org_mozdev_compactHeader.debug.log("coheToggleHeaderContent start");
var strHideLabel = document.getElementById("CompactHeader_CoheHideDetailsLabel").value;
var strShowLabel = document.getElementById("CompactHeader_CoheShowDetailsLabel").value;
var strLabel;
@@ -561,7 +509,7 @@ org.mozdev.compactHeader.pane = function() {
}
}
- org.mozdev.customizeHeaderToolbar.messenger.loadToolboxData();
+ org_mozdev_compactHeader.messenger.loadToolboxData();
if (gCoheCollapsedHeaderViewMode) {
strLabel = strShowLabel;
@@ -572,7 +520,7 @@ org.mozdev.compactHeader.pane = function() {
document.getElementById("CompactHeader_hideDetailsMenu").setAttribute("label", strLabel);
}
- org.mozdev.compactHeader.toolbar.setCurrentToolboxPosition(gCoheCollapsedHeaderViewMode);
+ org_mozdev_compactHeader.toolbar.setCurrentToolboxPosition(gCoheCollapsedHeaderViewMode);
if (document.getElementById("CompactHeader_hideDetailsMenu")) {
document.getElementById("CompactHeader_hideDetailsMenu").setAttribute("label", strLabel);
@@ -581,7 +529,7 @@ org.mozdev.compactHeader.pane = function() {
document.getElementById("CompactHeader_viewMenuCompactBroadcast")
.setAttribute("checked", gCoheCollapsedHeaderViewMode);
- pub.log("coheToggleHeaderContent stop");
+ org_mozdev_compactHeader.debug.log("coheToggleHeaderContent stop");
}
// default method for updating a header value into a header entry
@@ -610,7 +558,7 @@ org.mozdev.compactHeader.pane = function() {
// view care about this header value. if it does then call updateHeaderEntry
function coheUpdateMessageHeaders()
{
- pub.log("coheUpdateMessageHeaders start");
+ org_mozdev_compactHeader.debug.log("coheUpdateMessageHeaders start");
// Remove the height attr so that it redraws correctly. Works around a
// problem that attachment-splitter causes if it's moved high enough to
// affect the header box:
@@ -653,25 +601,25 @@ org.mozdev.compactHeader.pane = function() {
}
if (headerFirstTime) {
- pub.log("headerFirstTime");
+ org_mozdev_compactHeader.debug.log("headerFirstTime");
headerFirstTime = false;
var toolbox = document.getElementById("header-view-toolbox");
var mailToolbox = document.getElementById("mail-toolbox");
var oldCustomizeDone = toolbox.customizeDone;
var oldCustomizeDoneMailToolbox = mailToolbox.customizeDone;
toolbox.customizeDone = function(aEvent) {
- pub.log("customizeDone start");
+ org_mozdev_compactHeader.debug.log("customizeDone start");
oldCustomizeDone(aEvent);
- pub.log("customizeDone 0");
- org.mozdev.compactHeader.toolbar.onDoCustomizationHeaderViewToolbox("doCustomization");
- pub.log("customizeDone stop");
+ org_mozdev_compactHeader.debug.log("customizeDone 0");
+ org_mozdev_compactHeader.toolbar.onDoCustomizationHeaderViewToolbox("doCustomization");
+ org_mozdev_compactHeader.debug.log("customizeDone stop");
};
mailToolbox.customizeDone = function(aEvent) {
- pub.log("customizeDone start");
+ org_mozdev_compactHeader.debug.log("customizeDone start");
oldCustomizeDoneMailToolbox(aEvent);
- pub.log("customizeDone 0");
- org.mozdev.compactHeader.toolbar.onDoCustomizationHeaderViewToolbox("doCustomization");
- pub.log("customizeDone stop");
+ org_mozdev_compactHeader.debug.log("customizeDone 0");
+ org_mozdev_compactHeader.toolbar.onDoCustomizationHeaderViewToolbox("doCustomization");
+ org_mozdev_compactHeader.debug.log("customizeDone stop");
};
}
@@ -680,7 +628,7 @@ org.mozdev.compactHeader.pane = function() {
// now update the view to make sure the right elements are visible
coheUpdateHeaderView();
- pub.log("coheUpdateMessageHeaders stop");
+ org_mozdev_compactHeader.debug.log("coheUpdateMessageHeaders stop");
}
function selectEmailDisplayed() {
@@ -749,11 +697,11 @@ org.mozdev.compactHeader.pane = function() {
observe: function(aSubject, aTopic, aData)
{
- pub.log("prefObserver start");
+ org_mozdev_compactHeader.debug.log("prefObserver start");
if(aTopic != "nsPref:changed") return;
// aSubject is the nsIPrefBranch we're observing (after appropriate QI)
// aData is the name of the pref that's been changed (relative to aSubject)
- pub.log("prefObserver 1: " + aData);
+ org_mozdev_compactHeader.debug.log("prefObserver 1: " + aData);
if ( (aData == "headersize.addressstyle")
||(aData == "headersize.twolineview")
@@ -765,46 +713,46 @@ org.mozdev.compactHeader.pane = function() {
setDblClickHeaderEventHandler();
}
- pub.log("prefObserver stop");
+ org_mozdev_compactHeader.debug.log("prefObserver stop");
}
}
var wasHere = false;
function preferencesUpdate() {
- pub.log("preferencesUpdate " + wasHere);
+ org_mozdev_compactHeader.debug.log("preferencesUpdate " + wasHere);
if (!browserPreferences.getBoolPref("instantApply")
&& wasHere)
return;
- pub.log("preferencesUpdate 2");
+ org_mozdev_compactHeader.debug.log("preferencesUpdate 2");
wasHere = true;
ReloadMessage();
pub.coheOnLoadMsgHeaderPane();
- org.mozdev.compactHeader.toolbar.setCurrentToolboxPosition(gCoheCollapsedHeaderViewMode);
+ org_mozdev_compactHeader.toolbar.setCurrentToolboxPosition(gCoheCollapsedHeaderViewMode);
// var event = document.createEvent('Events');
// event.initEvent('messagepane-loaded', false, true);
// var headerViewElement = document.getElementById("msgHeaderView");
// headerViewElement.dispatchEvent(event);
setTimeout(clearReloadTimeout, 250);
- pub.log("preferencesUpdate stop");
+ org_mozdev_compactHeader.debug.log("preferencesUpdate stop");
}
function clearReloadTimeout() {
wasHere = false;
- pub.log("wasHere cleared");
+ org_mozdev_compactHeader.debug.log("wasHere cleared");
}
function coheCheckFirstRun() {
var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo);
-// pub.log("first run 0");
- var debugLevel = org.mozdev.compactHeader.debug.getLogLevel();
- pub.log("firstrun 3");
- org.mozdev.compactHeader.toolbar.populateEmptyToolbar();
+// org_mozdev_compactHeader.debug.log("first run 0");
+ var debugLevel = org_mozdev_compactHeader.debug.getLogLevel();
+ org_mozdev_compactHeader.debug.log("firstrun 3");
+ org_mozdev_compactHeader.toolbar.populateEmptyToolbar();
Components.utils.import("resource://gre/modules/AddonManager.jsm");
AddonManager.getAddonByID(COMPACTHEADER_EXTENSION_UUID,
function(myAddon) {
- pub.log("first run 2");
+ org_mozdev_compactHeader.debug.log("first run 2");
cohe.version = "";
cohe.firstrun = false;
cohe.current = myAddon.version;
@@ -815,24 +763,24 @@ org.mozdev.compactHeader.pane = function() {
} finally {
//check for first run
if (cohe.firstrun){
- pub.log("first run 2c");
- org.mozdev.compactHeader.toolbar.CHTSetDefaultButtons();
+ org_mozdev_compactHeader.debug.log("first run 2c");
+ org_mozdev_compactHeader.toolbar.CHTSetDefaultButtons();
cohePrefBranch.setBoolPref("firstrun",false);
cohePrefBranch.setCharPref("version",cohe.current);
- pub.log("first run 2cc");
+ org_mozdev_compactHeader.debug.log("first run 2cc");
}
//check for upgrade
if (cohe.version!=cohe.current && !cohe.firstrun){
cohePrefBranch.setCharPref("version",cohe.current);
- pub.log("found version change");
+ org_mozdev_compactHeader.debug.log("found version change");
// XXX
}
cohe.firstrun = false;
- pub.log("first run 2d");
+ org_mozdev_compactHeader.debug.log("first run 2d");
}
}
);
- pub.log("firstrun 4");
+ org_mozdev_compactHeader.debug.log("firstrun 4");
}
@@ -842,34 +790,34 @@ org.mozdev.compactHeader.pane = function() {
// if ((gExtensionManager.getItemForID(COMPACTHEADER_EXTENSION_UUID) == null) || isAddonDisabled(COMPACTHEADER_EXTENSION_UUID)) {
// return;
//}
- pub.log("before register");
+ org_mozdev_compactHeader.debug.log("before register");
coheUninstallObserver.register();
myPrefObserver.register();
- pub.log("register PrefObserver");
- pub.log("after register");
+ org_mozdev_compactHeader.debug.log("register PrefObserver");
+ org_mozdev_compactHeader.debug.log("after register");
if ((typeof MessageDisplayWidget != "undefined") && MessageDisplayWidget) {
- pub.log("coheInitializeOverlay found MessageDisplayWidget");
+ org_mozdev_compactHeader.debug.log("coheInitializeOverlay found MessageDisplayWidget");
var oldUpdateActiveMessagePane = MessageDisplayWidget.prototype._updateActiveMessagePane;
MessageDisplayWidget.prototype._updateActiveMessagePane = function() {
- pub.log("_updateActiveMessagePane start");
+ org_mozdev_compactHeader.debug.log("_updateActiveMessagePane start");
oldUpdateActiveMessagePane.call(this);
- org.mozdev.compactHeader.toolbar.setCurrentToolboxPosition(gCoheCollapsedHeaderViewMode);
- pub.log("_updateActiveMessagePane stop");
+ org_mozdev_compactHeader.toolbar.setCurrentToolboxPosition(gCoheCollapsedHeaderViewMode);
+ org_mozdev_compactHeader.debug.log("_updateActiveMessagePane stop");
};
}
else {
- pub.log("coheInitializeOverlay didn't find MessageDisplayWidget");
+ org_mozdev_compactHeader.debug.log("coheInitializeOverlay didn't find MessageDisplayWidget");
}
var multiMessage = document.getElementById("multimessage");
if (multiMessage) {
- pub.log("multiMessage " + multiMessage);
+ org_mozdev_compactHeader.debug.log("multiMessage " + multiMessage);
multiMessage.addEventListener("DOMContentLoaded", multiMessageLoaded, true);
}
addMessagePaneBoxFocusHandler();
setDblClickHeaderEventHandler();
- pub.log("coheInitializeOverlay stop");
+ org_mozdev_compactHeader.debug.log("coheInitializeOverlay stop");
};
function addMessagePaneBoxFocusHandler() {
@@ -883,28 +831,28 @@ org.mozdev.compactHeader.pane = function() {
var msgHeaderViewBackground;
function messagePaneBoxFocus(event) {
- pub.log("messagePaneBoxFocus start");
+ org_mozdev_compactHeader.debug.log("messagePaneBoxFocus start");
let msgHeaderView = document.getElementById("msgHeaderView");
let wintype = document.documentElement.getAttribute("windowtype");
// let tabmail = document.getElementById("tabmail");
if (cohePrefBranch.getBoolPref("header.darkenonfocus") &&
msgHeaderView && wintype && wintype == "mail:3pane" ) {
// && tabmail && tabmail.tabContainer.selectedIndex == 0) {
- pub.log("background: " +
+ org_mozdev_compactHeader.debug.log("background: " +
msgHeaderViewBackground);
if (typeof msgHeaderViewBackground === "undefined") {
var style =
document.defaultView.getComputedStyle(msgHeaderView, null);
msgHeaderViewBackground = style.getPropertyValue("background-color");
}
- pub.log("style: " + style);
- pub.log("background: " +
+ org_mozdev_compactHeader.debug.log("style: " + style);
+ org_mozdev_compactHeader.debug.log("background: " +
msgHeaderViewBackground);
let newColor = darkenColor(msgHeaderViewBackground);
msgHeaderView.style.backgroundColor = newColor;
// msgHeaderView.setAttribute('style', 'background-color:darkblue;');
}
- pub.log("messagePaneBoxFocus stop");
+ org_mozdev_compactHeader.debug.log("messagePaneBoxFocus stop");
}
function darkenColor(color) {
@@ -941,7 +889,7 @@ org.mozdev.compactHeader.pane = function() {
function setDblClickHeaderEventHandler() {
var msgHeaderViewDeck = document.getElementById("msgHeaderViewDeck");
if (msgHeaderViewDeck){
- pub.log("msgHeaderViewDeck " + msgHeaderViewDeck);
+ org_mozdev_compactHeader.debug.log("msgHeaderViewDeck " + msgHeaderViewDeck);
if (cohePrefBranch.getBoolPref("header.doubleclick"))
msgHeaderViewDeck.addEventListener("dblclick", pub.coheToggleHeaderView, true);
else
@@ -950,9 +898,9 @@ org.mozdev.compactHeader.pane = function() {
}
function multiMessageLoaded() {
- pub.log("multiMessageLoaded start");
- org.mozdev.compactHeader.toolbar.setCurrentToolboxPosition(gCoheCollapsedHeaderViewMode);
- pub.log("multiMessageLoaded stop");
+ org_mozdev_compactHeader.debug.log("multiMessageLoaded start");
+ org_mozdev_compactHeader.toolbar.setCurrentToolboxPosition(gCoheCollapsedHeaderViewMode);
+ org_mozdev_compactHeader.debug.log("multiMessageLoaded stop");
}
var coheUninstallObserver = {
@@ -962,7 +910,7 @@ org.mozdev.compactHeader.pane = function() {
subject.QueryInterface(Components.interfaces.nsIUpdateItem);
if (subject.id == COMPACTHEADER_EXTENSION_UUID) {
- pub.log("uninstalling COHE 1");
+ org_mozdev_compactHeader.debug.log("uninstalling COHE 1");
if (data == "item-uninstalled") {
this._uninstall = true;
} else if (data == "item-cancel-action") {
@@ -970,10 +918,10 @@ org.mozdev.compactHeader.pane = function() {
}
}
} else if (topic == "quit-application-granted") {
- pub.log("uninstalling COHE 2");
+ org_mozdev_compactHeader.debug.log("uninstalling COHE 2");
if (this._uninstall) {
cohePrefBranch.deleteBranch("");
- org.mozdev.compactHeader.toolbar.CHTCleanupButtons();
+ org_mozdev_compactHeader.toolbar.CHTCleanupButtons();
}
this.unregister();
}
@@ -991,19 +939,19 @@ org.mozdev.compactHeader.pane = function() {
},
register : function() {
- pub.log("register uninstall start");
+ org_mozdev_compactHeader.debug.log("register uninstall start");
var observerService =
Components.classes["@mozilla.org/observer-service;1"].
getService(Components.interfaces.nsIObserverService);
- pub.log("register uninstall start 1");
+ org_mozdev_compactHeader.debug.log("register uninstall start 1");
- pub.log("register uninstall start 2");
+ org_mozdev_compactHeader.debug.log("register uninstall start 2");
- pub.log("register uninstall neu 2");
+ org_mozdev_compactHeader.debug.log("register uninstall neu 2");
observerService.addObserver(this, "quit-application-granted", false);
Components.utils.import("resource://gre/modules/AddonManager.jsm");
AddonManager.addAddonListener(this);
- pub.log("register uninstall neu 2");
+ org_mozdev_compactHeader.debug.log("register uninstall neu 2");
},
unregister : function() {
var observerService =
@@ -1037,6 +985,6 @@ org.mozdev.compactHeader.pane = function() {
return pub;
}();
-addEventListener('messagepane-loaded', org.mozdev.compactHeader.pane.coheOnLoadMsgHeaderPane, true);
-addEventListener('messagepane-unloaded', org.mozdev.compactHeader.pane.coheOnUnloadMsgHeaderPane, true);
-addEventListener('load', org.mozdev.compactHeader.pane.coheInitializeOverlay, false);
+addEventListener('messagepane-loaded', org_mozdev_compactHeader.pane.coheOnLoadMsgHeaderPane, true);
+addEventListener('messagepane-unloaded', org_mozdev_compactHeader.pane.coheOnUnloadMsgHeaderPane, true);
+addEventListener('load', org_mozdev_compactHeader.pane.coheInitializeOverlay, false);
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index adb664c..a66b973 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -34,7 +34,7 @@
<key id="CompactHeader_hideDetailsKey"
modifiers="shift"
key="&CompactHeader_toggleDetails.key;"
- oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
+ oncommand="org_mozdev_compactHeader.pane.coheToggleHeaderView();"/>
</keyset>
<menupopup id="header-toolbar-context-menu">
@@ -49,7 +49,7 @@
<vbox id="CompactHeader_hideDetailsButtonBox" insertbefore="expandedHeadersBox">
<button id="CompactHeader_hideDetailsButton"
tooltiptext="&CompactHeader_hideDetailsButton.label;"
- onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+ onclick="org_mozdev_compactHeader.pane.coheToggleHeaderView();"
class="msgHeaderView-flat-button"/>
</vbox>
@@ -71,7 +71,7 @@
tooltiptext="&otherActionsButton.tooltip;"
class="toolbarbutton-1 msgHeaderView-button">
<menupopup id="otherActionsPopup"
- onpopupshowing="org.mozdev.compactHeader.toolbar.showOtherActionButtonMenu();">
+ onpopupshowing="org_mozdev_compactHeader.toolbar.showOtherActionButtonMenu();">
<menuitem id="CompactHeader_hdrPane-markFlagged"
type="checkbox"
label="&markStarredCmd.label;"
@@ -98,7 +98,7 @@
<menuseparator id="CompactHeader_otherActionPopupAfterViewSource"/>
<menuitem id="CompactHeader_hideDetailsMenu"
label="&CompactHeader_hideDetailsButton.label;"
- oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+ oncommand="org_mozdev_compactHeader.pane.coheToggleHeaderView();"
key="CompactHeader_hideDetailsKey"/>
<menuitem id="CompactHeader_hidecohePreferencesButton"
label="&CompactHeader_dialog.title;"
@@ -128,15 +128,15 @@
<menupopup id="CompactHeader_copyPopup" popupanchor="bottomleft">
<menuitem id="CompactHeader_copyPopup_CopyLink"
label="©LinkCmd.label;" accesskey="©LinkCmd.accesskey;"
- oncommand="org.mozdev.compactHeader.RSSLinkify.CopyToClipboard(document.popupNode, 'url')"/>
+ oncommand="org_mozdev_compactHeader.RSSLinkify.CopyToClipboard(document.popupNode, 'url')"/>
<menuitem id="CompactHeader_copyPopup_CopyText"
label="©Cmd.label;" accesskey="©Cmd.accesskey;"
- oncommand="org.mozdev.compactHeader.RSSLinkify.CopyToClipboard(document.popupNode, 'value')"/>
+ oncommand="org_mozdev_compactHeader.RSSLinkify.CopyToClipboard(document.popupNode, 'value')"/>
</menupopup>
<vbox id="CompactHeader_showDetailsButtonBox" align="start" flex="0">
<button id="CompactHeader_showDetailsButton"
tooltiptext="&CompactHeader_showDetailsButton.label;"
- onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+ onclick="org_mozdev_compactHeader.pane.coheToggleHeaderView();"
class="msgHeaderView-flat-button"/>
</vbox>
<vbox id="CompactHeader_collapsed1LHeadersBox" flex="1" collapsed="false">
@@ -245,7 +245,7 @@
label="&CompactHeader_compactMenu.label;"
type="checkbox"
accesskey="&CompactHeader_compactMenu.accesskey;"
- oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+ oncommand="org_mozdev_compactHeader.pane.coheToggleHeaderView();"
key="CompactHeader_hideDetailsKey">
<observes element="CompactHeader_viewMenuCompactBroadcast"
attribute="checked"/>
@@ -258,7 +258,7 @@
label="&CompactHeader_compactMenu.label;"
type="checkbox"
accesskey="&CompactHeader_compactMenu.accesskey;"
- oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+ oncommand="org_mozdev_compactHeader.pane.coheToggleHeaderView();"
key="CompactHeader_hideDetailsKey">
<observes element="CompactHeader_viewMenuCompactBroadcast"
attribute="checked"/>
diff --git a/chrome/CompactHeader/content/debug.js b/chrome/CompactHeader/content/debug.js
index 1b56b22..dd49fea 100644
--- a/chrome/CompactHeader/content/debug.js
+++ b/chrome/CompactHeader/content/debug.js
@@ -38,11 +38,13 @@
# ***** END LICENSE BLOCK *****
*/
-if(org === "undefined" || !org) var org = {};
-if(!org.mozdev) org.mozdev={};
-if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
-org.mozdev.compactHeader.debug = function() {
+if (typeof org_mozdev_compactHeader == "undefined") {
+ var org_mozdev_compactHeader = {};
+};
+
+
+org_mozdev_compactHeader.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.js
index f7a1c70..a40cb7f 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -40,12 +40,12 @@
//Components.utils.import("chrome://CompactHeader/content/debug.jsm");
-if(org === "undefined" || !org) var org = {};
-if(!org.mozdev) org.mozdev={};
-if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
+if (typeof org_mozdev_compactHeader == "undefined") {
+ var org_mozdev_compactHeader = {};
+};
-org.mozdev.compactHeader.toolbar = function() {
+org_mozdev_compactHeader.toolbar = function() {
var pub = {};
var cohePrefBranch = Components.classes["@mozilla.org/preferences-service;1"]
@@ -91,15 +91,15 @@ org.mozdev.compactHeader.toolbar = function() {
return gToolboxes[i];
}
}
- org.mozdev.compactHeader.debug.log("orient failed " + targetPos + " " + targetHeader,
- org.mozdev.compactHeader.debug.LOGLEVEL.warn);
+ org_mozdev_compactHeader.debug.log("orient failed " + targetPos + " " + targetHeader,
+ org_mozdev_compactHeader.debug.LOGLEVEL.warn);
return null;
}
pub.fillToolboxPalette = function () {
- org.mozdev.compactHeader.debug.log("fillToolboxPalette start");
+ org_mozdev_compactHeader.debug.log("fillToolboxPalette start");
removeButtonDispMUA();
var hdrToolbar = document.getElementById("header-view-toolbar");
var hdrToolbox = document.getElementById("header-view-toolbox");
@@ -155,7 +155,7 @@ org.mozdev.compactHeader.toolbar = function() {
hdrToolbar.currentSet = currentSet;
}
}
- org.mozdev.compactHeader.debug.log("fillToolboxPalette stop");
+ org_mozdev_compactHeader.debug.log("fillToolboxPalette stop");
};
var buttonsRemove = ["hdrForwardButton", "hdrArchiveButton",
@@ -169,21 +169,21 @@ org.mozdev.compactHeader.toolbar = function() {
button.setAttribute("collapsed", "true");
}
}
- org.mozdev.compactHeader.debug.log("fillToolboxPalette stop");
+ org_mozdev_compactHeader.debug.log("fillToolboxPalette stop");
};
pub.showOtherActionButtonMenu = function() {
- org.mozdev.compactHeader.debug.log("showOtherActionButtonMenu start");
+ org_mozdev_compactHeader.debug.log("showOtherActionButtonMenu start");
onShowOtherActionsPopup();
InitMessageMark();
for (let menu in gOtherMenuCommands) {
goUpdateCommand(gOtherMenuCommands[menu]);
}
- org.mozdev.compactHeader.debug.log("showOtherActionButtonMenu stop");
+ org_mozdev_compactHeader.debug.log("showOtherActionButtonMenu stop");
}
pub.setButtonStyle = function() {
- org.mozdev.compactHeader.debug.log("setButtonStyle start");
+ org_mozdev_compactHeader.debug.log("setButtonStyle start");
var hdrToolbar = document.getElementById("header-view-toolbar");
var hdrToolbox = document.getElementById("header-view-toolbox");
var buttons1 = Array.prototype.slice.call(hdrToolbar.querySelectorAll("toolbarbutton"));
@@ -217,7 +217,7 @@ org.mozdev.compactHeader.toolbar = function() {
}
}
- org.mozdev.compactHeader.debug.log("setButtonStyle start 1");
+ org_mozdev_compactHeader.debug.log("setButtonStyle start 1");
var buttons1 = Array.prototype.slice.call(hdrToolbar.querySelectorAll("toolbaritem"));
var buttons2 = Array.prototype.slice.call(hdrToolbox.palette.querySelectorAll("toolbaritem"));
@@ -237,11 +237,11 @@ org.mozdev.compactHeader.toolbar = function() {
}
}
- org.mozdev.compactHeader.debug.log("setButtonStyle stop");
+ org_mozdev_compactHeader.debug.log("setButtonStyle stop");
};
function moveToolbox(aHeaderViewMode, cBoxId, orient) {
- org.mozdev.compactHeader.debug.log("toolbar toggle start headermode: " + aHeaderViewMode +
+ org_mozdev_compactHeader.debug.log("toolbar toggle start headermode: " + aHeaderViewMode +
" cBoxId: " + cBoxId + " orien: " + orient);
var hdrToolbox = document.getElementById("header-view-toolbox");
var hdrToolbar = document.getElementById("header-view-toolbar");
@@ -286,11 +286,11 @@ org.mozdev.compactHeader.toolbar = function() {
}
pub.onChangeDispMUAicon();
hdrToolbar.setAttribute("orient", orient);
- org.mozdev.compactHeader.debug.log("toolbar toggle stop");
+ org_mozdev_compactHeader.debug.log("toolbar toggle stop");
};
pub.dispMUACheck = function() {
- org.mozdev.compactHeader.debug.log("dispMUACheck start");
+ org_mozdev_compactHeader.debug.log("dispMUACheck start");
var dispMUAButton = document.getElementById("CompactHeader_button-dispMUA");
var dispMUABox = document.getElementById("dispMUA");
if (dispMUABox) {
@@ -357,15 +357,15 @@ org.mozdev.compactHeader.toolbar = function() {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
}
- org.mozdev.compactHeader.debug.log("dispMUACheck stop");
+ org_mozdev_compactHeader.debug.log("dispMUACheck stop");
};
pub.onChangeDispMUAicon = function() {
- org.mozdev.compactHeader.debug.log("onChangeDispMUAicon start");
+ org_mozdev_compactHeader.debug.log("onChangeDispMUAicon start");
var dispMUAbroadcast = document.getElementById("dispMUAbroadcast")
if (dispMUAbroadcast) {
var imageSrc = dispMUAbroadcast.getAttribute("src");
- org.mozdev.compactHeader.debug.log("onChangeDispMUAicon: " + imageSrc);
+ org_mozdev_compactHeader.debug.log("onChangeDispMUAicon: " + imageSrc);
var IconContainerDispMUA = null;
/* toolbar button */
IconContainerDispMUA = document.getElementById("CompactHeader_button-dispMUA")
@@ -373,35 +373,35 @@ org.mozdev.compactHeader.toolbar = function() {
IconContainerDispMUA.setAttribute("image", imageSrc);
}
}
- org.mozdev.compactHeader.debug.log("onChangeDispMUAicon stop");
+ org_mozdev_compactHeader.debug.log("onChangeDispMUAicon stop");
};
function hideDispMUABox(dispMUABox) {
- org.mozdev.compactHeader.debug.log("hideDispMUABox start");
+ 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");
+ org_mozdev_compactHeader.debug.log("hideDispMUABox 1");
var broadcasterset = document.createElement("broadcasterset");
messengerWindow.appendChild(broadcasterset);
- org.mozdev.compactHeader.debug.log("hideDispMUABox 2");
+ org_mozdev_compactHeader.debug.log("hideDispMUABox 2");
dispMUAicon.parentNode.removeChild(dispMUAicon);
- org.mozdev.compactHeader.debug.log("hideDispMUABox 3");
+ org_mozdev_compactHeader.debug.log("hideDispMUABox 3");
var dispMUAbroadcast = document.createElement("broadcaster");
- org.mozdev.compactHeader.debug.log("hideDispMUABox 4");
+ org_mozdev_compactHeader.debug.log("hideDispMUABox 4");
dispMUAbroadcast.id = "dispMUAicon";
//dispMUAbroadcast.setAttribute("src", "");
dispMUAbroadcast.setAttribute("tooltiptext", "");
- org.mozdev.compactHeader.debug.log("hideDispMUABox 5");
+ org_mozdev_compactHeader.debug.log("hideDispMUABox 5");
broadcasterset.appendChild(dispMUAbroadcast);
- org.mozdev.compactHeader.debug.log("hideDispMUABox 6");
+ org_mozdev_compactHeader.debug.log("hideDispMUABox 6");
}
- org.mozdev.compactHeader.debug.log("hideDispMUABox stop");
+ org_mozdev_compactHeader.debug.log("hideDispMUABox stop");
};
function removeButtonDispMUA() {
- org.mozdev.compactHeader.debug.log("removeButtonDispMUA start");
+ org_mozdev_compactHeader.debug.log("removeButtonDispMUA start");
if (!document.getElementById("dispMUA")) {
var button = document.getElementById("CompactHeader_button-dispMUA");
if (button) {
@@ -420,7 +420,7 @@ org.mozdev.compactHeader.toolbar = function() {
button2.parentNode.removeChild(button2);
}
}
- org.mozdev.compactHeader.debug.log("removeButtonDispMUA stop");
+ org_mozdev_compactHeader.debug.log("removeButtonDispMUA stop");
};
function addClass(el, strClass) {
@@ -501,30 +501,30 @@ org.mozdev.compactHeader.toolbar = function() {
};
pub.populateEmptyToolbar = function() {
- org.mozdev.compactHeader.debug.log("start populateEmptyToolbar");
+ org_mozdev_compactHeader.debug.log("start populateEmptyToolbar");
var hdrToolbar = document.getElementById("header-view-toolbar");
if (hdrToolbar) {
- org.mozdev.compactHeader.debug.log("populateEmptyToolbar 1");
+ org_mozdev_compactHeader.debug.log("populateEmptyToolbar 1");
if (hdrToolbar.currentSet == "__empty") {
- org.mozdev.compactHeader.debug.log("populateEmptyToolbar 2");
+ org_mozdev_compactHeader.debug.log("populateEmptyToolbar 2");
pub.CHTSetDefaultButtons();
}
}
- org.mozdev.compactHeader.debug.log("stop populateEmptyToolbar");
+ org_mozdev_compactHeader.debug.log("stop populateEmptyToolbar");
};
pub.onDoCustomizationHeaderViewToolbox = function(event) {
- org.mozdev.compactHeader.debug.log("onDoCustomizationHeaderViewToolbox start" + event);
- org.mozdev.compactHeader.toolbar.CHTUpdateReplyButton();
- org.mozdev.compactHeader.toolbar.CHTUpdateJunkButton();
- org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
- org.mozdev.compactHeader.toolbar.dispMUACheck();
- org.mozdev.compactHeader.buttons.coheToggleStar();
+ org_mozdev_compactHeader.debug.log("onDoCustomizationHeaderViewToolbox start" + event);
+ org_mozdev_compactHeader.toolbar.CHTUpdateReplyButton();
+ org_mozdev_compactHeader.toolbar.CHTUpdateJunkButton();
+ org_mozdev_compactHeader.messenger.saveToolboxData();
+ org_mozdev_compactHeader.toolbar.dispMUACheck();
+ org_mozdev_compactHeader.buttons.coheToggleStar();
var dispMUAicon = document.getElementById("dispMUAicon");
if (dispMUAicon) {
- org.mozdev.compactHeader.toolbar.onChangeDispMUAicon();
+ org_mozdev_compactHeader.toolbar.onChangeDispMUAicon();
}
- org.mozdev.compactHeader.debug.log("onDoCustomizationHeaderViewToolbox done");
+ org_mozdev_compactHeader.debug.log("onDoCustomizationHeaderViewToolbox done");
};
var setToolboxRunning = false;
@@ -535,12 +535,12 @@ org.mozdev.compactHeader.toolbar = function() {
pub.setCurrentToolboxPosition = function(aHeaderViewMode) {
var targetType = "single";
if (setToolboxRunning) {
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition is running");
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition is running");
return;
}
setToolboxRunning = true;
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition start");
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition start");
var singleMessage = document.getElementById("singlemessage");
var targetPos = cohePrefBranch.getCharPref("toolbox.position");
@@ -551,56 +551,56 @@ org.mozdev.compactHeader.toolbar = function() {
targetType = "multi";
}
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition 1");
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition 1");
if ((currentToolboxPosition == targetPos) &&
(currentToolboxType == targetType) &&
(currentHeaderViewMode == aHeaderViewMode) &&
(targetType == "single")) {
- org.mozdev.compactHeader.debug.log("curPos: " + currentToolboxPosition + " targetPos: " + targetPos);
- org.mozdev.compactHeader.debug.log("curType: " + currentToolboxType + " targetType: " + targetType);
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition does not need to change position/type");
+ org_mozdev_compactHeader.debug.log("curPos: " + currentToolboxPosition + " targetPos: " + targetPos);
+ org_mozdev_compactHeader.debug.log("curType: " + currentToolboxType + " targetType: " + targetType);
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition does not need to change position/type");
setToolboxRunning = false;
return;
}
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition 2");
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition 2");
currentToolboxPosition = targetPos;
currentToolboxType = targetType;
currentHeaderViewMode = aHeaderViewMode;
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition 3");
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition 3");
if (multiMessage){
- org.mozdev.compactHeader.debug.log("multiMessage " + multiMessage);
+ org_mozdev_compactHeader.debug.log("multiMessage " + multiMessage);
try {
multiBBox = multiMessage.contentDocument.getElementById("header-view-toolbox");
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition have multiMessage.contentDocument");
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition have multiMessage.contentDocument");
}
catch (e) {
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition no multiMessage.contentDocument " + e);
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition no multiMessage.contentDocument " + e);
}
}
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition mid 0");
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition mid 0");
var hdrViewToolbox = document.getElementById("header-view-toolbox");
if (!hdrViewToolbox) {
- org.mozdev.compactHeader.debug.log("no header-view-toolbox!",
- org.mozdev.compactHeader.debug.LOGLEVEL.warn);
+ org_mozdev_compactHeader.debug.log("no header-view-toolbox!",
+ org_mozdev_compactHeader.debug.LOGLEVEL.warn);
setToolboxRunning = false;
return;
}
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition mid 1");
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition mid 1");
if (targetPos == "none") {
hdrViewToolbox.setAttribute("collapsed", "true");
if (multiBBox) {
multiBBox.setAttribute("collapsed", "true");
}
- org.mozdev.compactHeader.debug.log("none stop");
+ org_mozdev_compactHeader.debug.log("none stop");
setToolboxRunning = false;
return;
}
@@ -611,7 +611,7 @@ org.mozdev.compactHeader.toolbar = function() {
}
}
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition mid 2");
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition mid 2");
if (multiBBox) {
multiBBox.removeAttribute("collapsed");
@@ -619,16 +619,16 @@ org.mozdev.compactHeader.toolbar = function() {
if (singleMessage && singleMessage.getAttribute("hidden")) {
// The multi message view is visible
- org.mozdev.compactHeader.debug.log("move to multibuttonhbox");
+ org_mozdev_compactHeader.debug.log("move to multibuttonhbox");
var targetToolbox = getToolbarTarget(targetPos, "");
- org.mozdev.compactHeader.debug.log("move to multibuttonhbox 1");
+ org_mozdev_compactHeader.debug.log("move to multibuttonhbox 1");
if (multiBBox) {
if (targetPos != "top") {
- org.mozdev.compactHeader.debug.log("x multiBBox: "+multiBBox);
+ org_mozdev_compactHeader.debug.log("x multiBBox: "+multiBBox);
multiBBox.setAttribute("collapsed", "true");
hdrViewToolbox.removeAttribute("collapsed");
} else {
- org.mozdev.compactHeader.debug.log("x multiBBox: "+multiBBox);
+ org_mozdev_compactHeader.debug.log("x multiBBox: "+multiBBox);
multiBBox.removeAttribute("collapsed");
hdrViewToolbox.setAttribute("collapsed", "true");
}
@@ -639,21 +639,21 @@ org.mozdev.compactHeader.toolbar = function() {
}
else {
// The single message view is visible
- org.mozdev.compactHeader.debug.log("move to singlemessage");
+ org_mozdev_compactHeader.debug.log("move to singlemessage");
var targetToolbox;
if (aHeaderViewMode) {
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition aHeaderViewMode");
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition aHeaderViewMode");
targetToolbox = getToolbarTarget(targetPos, "compact");
}
else {
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition no aHeaderViewMode");
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition no aHeaderViewMode");
targetToolbox = getToolbarTarget(targetPos, "expanded");
}
if (targetToolbox) {
moveToolbox(aHeaderViewMode, targetToolbox.id, targetToolbox.orient);
}
}
- org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition stop");
+ org_mozdev_compactHeader.debug.log("setCurrentToolboxPosition stop");
setToolboxRunning = false;
}
diff --git a/install.rdf b/install.rdf
index 6290753..548538f 100644
--- a/install.rdf
+++ b/install.rdf
@@ -14,7 +14,7 @@
<em:translator>Peter Klofutar</em:translator>
</Description>
</em:localized>
- <em:version>2.1.0beta2</em:version>
+ <em:version>2.1.0beta3</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>
@@ -32,7 +32,7 @@
<RDF:Description>
<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
<em:minVersion>37.0a1</em:minVersion>
- <em:maxVersion>37.0</em:maxVersion>
+ <em:maxVersion>38.0</em:maxVersion>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
--
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