[Pkg-mozext-commits] [compactheader] 220/441: New version 1.4.2: Bugfix (toggle header) did not work after toolbar customization.
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 ad821746ea2d154d8e0f6592c009b61494aa2035
Author: joachim <none at none>
Date: Fri Jul 22 00:56:24 2011 +0200
New version 1.4.2:
Bugfix (toggle header) did not work after toolbar customization.
--HG--
rename : chrome/CompactHeader/content/RSSLinkify.jsm => chrome/CompactHeader/content/RSSLinkify.js
rename : chrome/CompactHeader/content/debug.jsm => chrome/CompactHeader/content/debug.js
rename : chrome/CompactHeader/content/toolbar.jsm => chrome/CompactHeader/content/toolbar.js
---
.../content/{RSSLinkify.jsm => RSSLinkify.js} | 8 +-
.../CompactHeader/content/compactHeaderOverlay.js | 205 ++++++++++-----------
.../CompactHeader/content/compactHeaderOverlay.xul | 3 +
.../content/customizeToolbarOverlay.xul | 3 +
.../CompactHeader/content/{debug.jsm => debug.js} | 0
.../content/{toolbar.jsm => toolbar.js} | 8 +-
install.rdf | 2 +-
7 files changed, 119 insertions(+), 110 deletions(-)
diff --git a/chrome/CompactHeader/content/RSSLinkify.jsm b/chrome/CompactHeader/content/RSSLinkify.js
similarity index 96%
rename from chrome/CompactHeader/content/RSSLinkify.jsm
rename to chrome/CompactHeader/content/RSSLinkify.js
index c768ebe..8b9ec2d 100644
--- a/chrome/CompactHeader/content/RSSLinkify.jsm
+++ b/chrome/CompactHeader/content/RSSLinkify.js
@@ -40,7 +40,7 @@
EXPORTED_SYMBOLS = ["org"];
-Components.utils.import("chrome://CompactHeader/content/debug.jsm");
+//Components.utils.import("chrome://CompactHeader/content/debug.jsm");
if(!org) var org={};
if(!org.mozdev) org.mozdev={};
@@ -63,6 +63,10 @@ org.mozdev.compactHeader.RSSLinkify = function() {
pub.UpdateHeaderView = function(currentHeaderData) {
org.mozdev.compactHeader.debug.log("updateheaderview start");
+ if (!currentHeaderData) {
+ org.mozdev.compactHeader.debug.log("updateheaderview: no currentHeaderData!");
+ return;
+ }
if (cohePrefBranch.getBoolPref("headersize.linkify")) {
var url = currentHeaderData["content-base"];
if(url) {
@@ -96,7 +100,7 @@ org.mozdev.compactHeader.RSSLinkify = function() {
org.mozdev.compactHeader.debug.log("updateheaderview stop");
};
- pub.InitializeHeaderViewTables = function(document) {
+ pub.InitializeHeaderViewTables = function() {
org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start");
if (cohePrefBranch.getBoolPref("headersize.linkify")) {
org.mozdev.compactHeader.debug.log("rss InitializeHeaderViewTables start 1");
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 347b87d..869e923 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -55,20 +55,20 @@ 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");
+//Components.utils.import("chrome://CompactHeader/content/debug.jsm");
+//Components.utils.import("chrome://CompactHeader/content/toolbar.jsm");
org.mozdev.compactHeader.pane = function() {
var pub = {};
const COHE_EXTENSION_UUID = "{58D4392A-842E-11DE-B51A-C7B855D89593}";
-
+
// var regex = {
// /* taken from https://bugzilla.mozilla.org/show_bug.cgi?id=57104 */
// links : /((\w+):\/\/[^<>()'"\s]+|www(\.[-\w]+){2,})/
// };
-//
+//
var gCoheCollapsedHeaderViewMode = false;
var gCoheBuiltCollapsedView = false;
@@ -82,14 +82,14 @@ org.mozdev.compactHeader.pane = function() {
// {name:"toCcBcc", useToggle:true, outputFunction:coheOutputEmailAddresses},
{name:"date", outputFunction:coheUpdateDateValue}
];
-
+
var gCoheCollapsedHeader2LListLongAddresses = [
{name:"subject", outputFunction:coheOutputSubject},
{name:"from", useToggle:true, outputFunction:coheOutputEmailAddresses},
{name:"toCcBcc", useToggle:true, outputFunction:coheOutputEmailAddresses},
{name:"date", outputFunction:coheUpdateDateValue}
];
-
+
var cohePrefBranch = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService)
.getBranch("extensions.CompactHeader.");
@@ -99,34 +99,34 @@ org.mozdev.compactHeader.pane = function() {
firstrun: true,
current: -1
};
-
+
var coheFirstTime = true;
-
+
function coheOutputSubject(headerEntry, headerValue) {
var subjectBox;
-
+
if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
subjectBox = document.getElementById("collapsed2LsubjectOutBox")
} else {
subjectBox = document.getElementById("collapsed1LsubjectOutBox")
}
-
+
// if (subjectBox) {
// subjectBox.setAttribute("tooltiptext", headerValue);
// }
updateHeaderValue(headerEntry, headerValue);
}
-
+
function coheOutputEmailAddresses(headerEntry, emailAddresses) {
/* function copied from comm-1.9.1/ mail/ base/ content/ msgHdrViewOverlay.js 771135e6aaf5 */
if (!emailAddresses)
return;
-
+
var addresses = {};
var fullNames = {};
var names = {};
var numAddresses = 0;
-
+
var msgHeaderParser = Components.classes["@mozilla.org/messenger/headerparser;1"]
.getService(Components.interfaces.nsIMsgHeaderParser);
numAddresses = msgHeaderParser.parseHeadersWithArray(emailAddresses, addresses, names, fullNames);
@@ -152,55 +152,55 @@ org.mozdev.compactHeader.pane = function() {
}
index++;
}
-
+
if (headerEntry.useToggle && (typeof headerEntry.enclosingBox.buildViews == 'function'))
headerEntry.enclosingBox.buildViews();
//OutputEmailAddresses(headerEntry, emailAddresses);
}
-
+
// Now, for each view the message pane can generate, we need a global table
// of headerEntries. These header entry objects are generated dynamically
// based on the static data in the header lists (see above) and elements
// we find in the DOM based on properties in the header lists.
var gCoheCollapsedHeaderView = {};
-
+
function coheInitializeHeaderViewTables()
{
gCoheCollapsedHeaderView = {};
var index;
-
+
if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
for (index = 0; index < gCoheCollapsedHeader2LListLongAddresses.length; index++) {
gCoheCollapsedHeaderView[gCoheCollapsedHeader2LListLongAddresses[index].name] =
new createHeaderEntry('collapsed2L', gCoheCollapsedHeader2LListLongAddresses[index]);
}
- } else {
+ } else {
for (index = 0; index < gCoheCollapsedHeader1LListLongAddresses.length; index++) {
gCoheCollapsedHeaderView[gCoheCollapsedHeader1LListLongAddresses[index].name] =
new createHeaderEntry('collapsed1L', gCoheCollapsedHeader1LListLongAddresses[index]);
}
}
-
- org.mozdev.compactHeader.RSSLinkify.InitializeHeaderViewTables(document);
+
+ org.mozdev.compactHeader.RSSLinkify.InitializeHeaderViewTables();
}
-
- pub.coheOnLoadMsgHeaderPane = function() {
+
+ pub.coheOnLoadMsgHeaderPane = function() {
org.mozdev.compactHeader.debug.log("start coheOnLoadMsgHeaderPane");
coheInitializeHeaderViewTables();
-
+
// Add an address book listener so we can update the header view when things
// change.
Components.classes["@mozilla.org/abmanager;1"]
.getService(Components.interfaces.nsIAbManager)
.addAddressBookListener(coheAddressBookListener,
Components.interfaces.nsIAbListener.all);
-
+
var deckHeaderView = document.getElementById("msgHeaderViewDeck");
-
- gCoheCollapsedHeaderViewMode =
- deckHeaderView.selectedPanel == document.getElementById('collapsedHeaderView');
-
+
+ gCoheCollapsedHeaderViewMode =
+ deckHeaderView.selectedPanel == document.getElementById('collapsedHeaderView');
+
// work around XUL deck bug where collapsed header view, if it's the persisted
// default, wouldn't be sized properly because of the larger expanded
// view "stretches" the deck.
@@ -208,7 +208,7 @@ org.mozdev.compactHeader.pane = function() {
document.getElementById('expandedHeaderView').collapsed = true;
else
document.getElementById('collapsedHeaderView').collapsed = true;
-
+
if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
document.getElementById('collapsed1LHeadersBox').collapsed = true;
document.getElementById('collapsed2LHeadersBox').collapsed = false;
@@ -216,13 +216,13 @@ org.mozdev.compactHeader.pane = function() {
document.getElementById('collapsed1LHeadersBox').collapsed = false;
document.getElementById('collapsed2LHeadersBox').collapsed = true;
}
-
+
if (coheFirstTime)
{
coheFirstTime = false;
gMessageListeners.push(coheMessageListener);
org.mozdev.customizeHeaderToolbar.messenger.loadToolboxData();
- org.mozdev.compactHeader.toolbar.fillToolboxPalette(document);
+ org.mozdev.compactHeader.toolbar.fillToolboxPalette();
org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
var toolbox = document.getElementById("header-view-toolbox");
toolbox.customizeDone = function(aEvent) {
@@ -235,42 +235,42 @@ org.mozdev.compactHeader.pane = function() {
org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
};
}
-
+
if (cohe.firstrun) {
coheCheckFirstRun();
}
coheToggleHeaderContent();
- org.mozdev.compactHeader.toolbar.setButtonStyle(document);
+ org.mozdev.compactHeader.toolbar.setButtonStyle();
org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
}
-
- var coheMessageListener =
+
+ var coheMessageListener =
{
- onStartHeaders:
+ onStartHeaders:
function cML_onStartHeaders () {
- gCoheBuiltCollapsedView = false;
+ gCoheBuiltCollapsedView = false;
},
-
- onEndHeaders:
+
+ onEndHeaders:
function cML_onEndHeaders() {
- ClearHeaderView(gCoheCollapsedHeaderView);
+ ClearHeaderView(gCoheCollapsedHeaderView);
coheUpdateMessageHeaders();
},
-
+
onEndAttachments: function cML_onEndAttachments(){}
};
-
+
pub.coheOnUnloadMsgHeaderPane = function()
{
Components.classes["@mozilla.org/abmanager;1"]
.getService(Components.interfaces.nsIAbManager)
.removeAddressBookListener(coheAddressBookListener);
-
+
removeEventListener('messagepane-loaded', coheOnLoadMsgHeaderPane, true);
removeEventListener('messagepane-unloaded', coheOnUnloadMsgHeaderPane, true);
}
-
+
var coheAddressBookListener =
{
onItemAdded: function(aParentDir, aItem) {
@@ -283,7 +283,7 @@ org.mozdev.compactHeader.pane = function() {
nsIAbListener.directoryRemoved,
aParentDir, aItem);
},
-
+
onItemPropertyChanged: function(aItem, aProperty, aOldValue, aNewValue) {
// We only need updates for card changes, address book and mailing list
// ones don't affect us here.
@@ -291,11 +291,11 @@ org.mozdev.compactHeader.pane = function() {
coheOnAddressBookDataChanged(nsIAbListener.itemChanged, null, aItem);
}
}
-
+
function coheOnAddressBookDataChanged(aAction, aParentDir, aItem) {
gEmailAddressHeaderNames.forEach(function (headerName) {
var headerEntry = null;
-
+
if (headerName in gCoheCollapsedHeaderView) {
headerEntry = gCoheCollapsedHeaderView[headerName];
if (headerEntry)
@@ -305,27 +305,27 @@ org.mozdev.compactHeader.pane = function() {
}
});
}
-
+
// make sure the appropriate fields within the currently displayed view header mode
// are collapsed or visible...
function coheUpdateHeaderView()
{
if (gCoheCollapsedHeaderViewMode)
showHeaderView(gCoheCollapsedHeaderView);
-
+
org.mozdev.compactHeader.RSSLinkify.UpdateHeaderView(currentHeaderData);
-
+
if (cohePrefBranch.getBoolPref("headersize.addressstyle")) {
selectEmailDisplayed();
}
-
+
//org.mozdev.compactHeader.toolbar.fillToolboxPalette();
coheToggleHeaderContent();
org.mozdev.customizeHeaderToolbar.pane.CHTUpdateReplyButton();
org.mozdev.customizeHeaderToolbar.pane.CHTUpdateJunkButton();
org.mozdev.compactHeader.buttons.coheToggleStar();
}
-
+
function enableButtons() {
var hdrToolbar = document.getElementById("header-view-toolbar");
if (toolbar) {
@@ -338,12 +338,12 @@ org.mozdev.compactHeader.pane = function() {
pub.coheToggleHeaderView = function() {
gCoheCollapsedHeaderViewMode = !gCoheCollapsedHeaderViewMode;
-
+
let deck = document.getElementById('msgHeaderViewDeck');
// Work around a xul deck bug where the height of the deck is determined
// by the tallest panel in the deck even if that panel is not selected...
deck.selectedPanel.collapsed = true;
-
+
if (gCoheCollapsedHeaderViewMode) {
deck.selectedPanel = document.getElementById("collapsedHeaderView")
coheUpdateMessageHeaders();
@@ -353,22 +353,22 @@ org.mozdev.compactHeader.pane = function() {
UpdateExpandedMessageHeaders();
//gDBView.reloadMessage();
}
-
+
// Work around a xul deck bug where the height of the deck is determined
// by the tallest panel in the deck even if that panel is not selected...
deck.selectedPanel.collapsed = false;
syncGridColumnWidths();
-
+
coheToggleHeaderContent();
}
-
+
function coheToggleHeaderContent() {
var strHideLabel = document.getElementById("CoheHideDetailsLabel").value;
var strShowLabel = document.getElementById("CoheShowDetailsLabel").value;
var strLabel;
-
+
var smimeBox = document.getElementById("smimeBox");
-
+
if (smimeBox != null) {
if (gCoheCollapsedHeaderViewMode) {
var parent = document.getElementById("collapsed2LdateOutBox");
@@ -384,10 +384,10 @@ org.mozdev.compactHeader.pane = function() {
parent.insertBefore(smimeBox, refElement);
}
}
- }
-
+ }
+
var dispMUABox = document.getElementById("dispMUA");
-
+
if (dispMUABox != null) {
if (gCoheCollapsedHeaderViewMode) {
var parent = document.getElementById("collapsed2LdateOutBox");
@@ -403,10 +403,10 @@ org.mozdev.compactHeader.pane = function() {
parent.insertBefore(dispMUABox, refElement);
}
}
- }
+ }
org.mozdev.customizeHeaderToolbar.messenger.loadToolboxData();
-
+
if (gCoheCollapsedHeaderViewMode) {
strLabel = strShowLabel;
} else {
@@ -417,19 +417,19 @@ org.mozdev.compactHeader.pane = function() {
document.getElementById("hideDetailsMenu").setAttribute("label", strLabel);
}
- org.mozdev.compactHeader.toolbar.toggle(document, gCoheCollapsedHeaderViewMode);
-
+ org.mozdev.compactHeader.toolbar.toggle(gCoheCollapsedHeaderViewMode);
+
if (document.getElementById("hideDetailsMenu")) {
document.getElementById("hideDetailsMenu").setAttribute("label", strLabel);
}
}
-
+
// default method for updating a header value into a header entry
function coheUpdateHeaderValueInTextNode(headerEntry, headerValue)
{
headerEntry.textNode.value = headerValue;
}
-
+
function coheUpdateDateValue(headerEntry, headerValue) {
//var t = currentHeaderData.date.headerValue;
var d
@@ -438,8 +438,8 @@ org.mozdev.compactHeader.pane = function() {
d = document.getElementById("collapsed2LdateBox");
d.textContent = headerValue;
}
-
-
+
+
// coheUpdateMessageHeaders: Iterate through all the current header data we received from mime for this message
// for each header entry table, see if we have a corresponding entry for that header. i.e. does the particular
// view care about this header value. if it does then call updateHeaderEntry
@@ -449,14 +449,14 @@ org.mozdev.compactHeader.pane = function() {
// problem that attachment-splitter causes if it's moved high enough to
// affect the header box:
document.getElementById('msgHeaderView').removeAttribute('height');
-
+
// iterate over each header we received and see if we have a matching entry
// in each header view table...
for (var headerName in currentHeaderData)
{
var headerField = currentHeaderData[headerName];
var headerEntry = null;
-
+
if (gCoheCollapsedHeaderViewMode && !gCoheBuiltCollapsedView)
{
if (headerName == "cc" || headerName == "to" || headerName == "bcc")
@@ -464,20 +464,20 @@ org.mozdev.compactHeader.pane = function() {
else if (headerName in gCoheCollapsedHeaderView)
headerEntry = gCoheCollapsedHeaderView[headerName];
}
-
+
if (headerEntry) {
headerEntry.outputFunction(headerEntry, headerField.headerValue);
headerEntry.valid = true;
}
}
-
+
if (gCoheCollapsedHeaderViewMode)
gCoheBuiltCollapsedView = true;
-
+
// now update the view to make sure the right elements are visible
coheUpdateHeaderView();
}
-
+
function selectEmailDisplayed() {
var xulemail = document.getElementById("collapsedtoCcBccBox");
if (xulemail != null) {
@@ -516,7 +516,7 @@ org.mozdev.compactHeader.pane = function() {
}
}
};
-
+
var myPrefObserverHeaderSize =
{
register: function()
@@ -524,41 +524,41 @@ org.mozdev.compactHeader.pane = function() {
// First we'll need the preference services to look for preferences.
var prefService = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService);
-
+
// For this._branch we ask that the preferences for extensions.myextension. and children
this._branch = prefService.getBranch("extensions.CompactHeader.headersize.");
-
- // Now we queue the interface called nsIPrefBranch2. This interface is described as:
+
+ // Now we queue the interface called nsIPrefBranch2. This interface is described as:
// "nsIPrefBranch2 allows clients to observe changes to pref values."
this._branch.QueryInterface(Components.interfaces.nsIPrefBranch2);
-
+
// Finally add the observer.
this._branch.addObserver("", this, false);
},
-
+
unregister: function()
{
if(!this._branch) return;
this._branch.removeObserver("", this);
},
-
+
observe: function(aSubject, aTopic, aData)
{
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)
-
+
var event = document.createEvent('Events');
event.initEvent('messagepane-loaded', false, true);
var headerViewElement = document.getElementById("msgHeaderView");
headerViewElement.dispatchEvent(event);
-
+
gDBView.reloadMessage();
}
}
-
+
myPrefObserverHeaderSize.register();
-
+
function coheCheckFirstRun() {
var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo);
@@ -574,7 +574,7 @@ org.mozdev.compactHeader.pane = function() {
if ((cohe.gExtensionManager.getItemForID(COHE_EXTENSION_UUID) == null) || (isAddonDisabled(COHE_EXTENSION_UUID))) {
return;
}
-
+
var debugLevel = org.mozdev.compactHeader.debug.getLogLevel();
cohe.current = cohe.gExtensionManager.getItemForID(COHE_EXTENSION_UUID).version;
try{
@@ -634,7 +634,7 @@ org.mozdev.compactHeader.pane = function() {
// org.mozdev.compactHeader.debug.log("firstrun 4");
}
-
+
pub.coheInitializeOverlay = function() {
// var gExtensionManager = Components.classes["@mozilla.org/extensions/manager;1"].getService(Components.interfaces.nsIExtensionManager);
// check if this is part of CompactHeader
@@ -645,13 +645,13 @@ org.mozdev.compactHeader.pane = function() {
coheUninstallObserver.register();
org.mozdev.compactHeader.debug.log("after register");
}
-
+
var coheUninstallObserver = {
_uninstall : false,
observe : function(subject, topic, data) {
if (topic == "em-action-requested") {
subject.QueryInterface(Components.interfaces.nsIUpdateItem);
-
+
if (subject.id == COHE_EXTENSION_UUID) {
org.mozdev.compactHeader.debug.log("uninstalling COHE 1");
if (data == "item-uninstalled") {
@@ -680,14 +680,14 @@ org.mozdev.compactHeader.pane = function() {
this._uninstall = (addon.pendingOperations & AddonManager.PENDING_UNINSTALL) != 0;
}
},
-
+
register : function() {
org.mozdev.compactHeader.debug.log("register uninstall start");
var observerService =
Components.classes["@mozilla.org/observer-service;1"].
getService(Components.interfaces.nsIObserverService);
org.mozdev.compactHeader.debug.log("register uninstall start 1");
-
+
var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo);
var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
@@ -702,7 +702,7 @@ org.mozdev.compactHeader.pane = function() {
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);
+ AddonManager.addAddonListener(this);
org.mozdev.compactHeader.debug.log("register uninstall neu 2");
}
},
@@ -710,7 +710,7 @@ org.mozdev.compactHeader.pane = function() {
var observerService =
Components.classes["@mozilla.org/observer-service;1"].
getService(Components.interfaces.nsIObserverService);
-
+
var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
.getService(Components.interfaces.nsIVersionComparator);
if(versionChecker.compare(appInfo.version, "3.2a1pre") < 0) {
@@ -719,28 +719,28 @@ org.mozdev.compactHeader.pane = function() {
}
else {
observerService.removeObserver(this, "quit-application-granted");
- AddonManager.removeAddonListener(this);
+ AddonManager.removeAddonListener(this);
}
}
}
-
+
function isAddonDisabled(uuid) {
var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
var addon = rdfService.GetResource("urn:mozilla:item:" + uuid);
-
+
var em = Components.classes["@mozilla.org/extensions/manager;1"].getService(Components.interfaces.nsIExtensionManager);
var ds = em.datasource;
-
+
var appRes = rdfService.GetResource("http://www.mozilla.org/2004/em-rdf#appDisabled");
var appDisabled = ds.GetTarget(addon, appRes, true);
if(appDisabled instanceof Components.interfaces.nsIRDFLiteral && appDisabled.Value == "true")
return true;
-
+
var userRes = rdfService.GetResource("http://www.mozilla.org/2004/em-rdf#userDisabled");
var userDisabled = ds.GetTarget(addon, userRes, true);
if(userDisabled instanceof Components.interfaces.nsIRDFLiteral && userDisabled.Value == "true")
return true;
-
+
return false;
}
return pub;
@@ -749,4 +749,3 @@ org.mozdev.compactHeader.pane = function() {
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 5ac9155..1d8656d 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -21,7 +21,10 @@
<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"
src="chrome://CompactHeader/content/CHTMessenger.js"/>
<script type="application/javascript" src="chrome://CompactHeader/content/buttonsOverlay.js"/>
diff --git a/chrome/CompactHeader/content/customizeToolbarOverlay.xul b/chrome/CompactHeader/content/customizeToolbarOverlay.xul
index a9324a1..39aef22 100644
--- a/chrome/CompactHeader/content/customizeToolbarOverlay.xul
+++ b/chrome/CompactHeader/content/customizeToolbarOverlay.xul
@@ -10,6 +10,9 @@
<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.jsm b/chrome/CompactHeader/content/debug.js
similarity index 100%
rename from chrome/CompactHeader/content/debug.jsm
rename to chrome/CompactHeader/content/debug.js
diff --git a/chrome/CompactHeader/content/toolbar.jsm b/chrome/CompactHeader/content/toolbar.js
similarity index 98%
rename from chrome/CompactHeader/content/toolbar.jsm
rename to chrome/CompactHeader/content/toolbar.js
index 1f7d237..8afaf06 100644
--- a/chrome/CompactHeader/content/toolbar.jsm
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -40,7 +40,7 @@
EXPORTED_SYMBOLS = ["org"];
-Components.utils.import("chrome://CompactHeader/content/debug.jsm");
+//Components.utils.import("chrome://CompactHeader/content/debug.jsm");
if(!org) var org={};
if(!org.mozdev) org.mozdev={};
@@ -54,7 +54,7 @@ org.mozdev.compactHeader.toolbar = function() {
.getService(Components.interfaces.nsIPrefService)
.getBranch("extensions.CompactHeader.");
- pub.fillToolboxPalette = function (document) {
+ pub.fillToolboxPalette = function () {
org.mozdev.compactHeader.debug.log("fillToolboxPalette start");
var hdrToolbar = document.getElementById("header-view-toolbar");
var hdrToolbox = document.getElementById("header-view-toolbox");
@@ -137,7 +137,7 @@ org.mozdev.compactHeader.toolbar = function() {
org.mozdev.compactHeader.debug.log("fillToolboxPalette stop");
};
- pub.setButtonStyle = function(document) {
+ pub.setButtonStyle = function() {
org.mozdev.compactHeader.debug.log("setButtonStyle start");
var hdrToolbar = document.getElementById("header-view-toolbar");
var hdrToolbox = document.getElementById("header-view-toolbox");
@@ -234,7 +234,7 @@ org.mozdev.compactHeader.toolbar = function() {
org.mozdev.compactHeader.debug.log("setButtonStyle stop");
};
- pub.toggle = function(document, aHeaderViewMode) {
+ pub.toggle = function(aHeaderViewMode) {
var hdrToolbox = document.getElementById("header-view-toolbox");
var hdrToolbar = document.getElementById("header-view-toolbar");
var strHideLabel = document.getElementById("CoheHideDetailsLabel").value;
diff --git a/install.rdf b/install.rdf
index fd10e89..4aa09ae 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
<RDF:Description about="urn:mozilla:install-manifest">
<em:name>CompactHeader</em:name>
- <em:version>1.4.1</em:version>
+ <em:version>1.4.2</em:version>
<em:description>Add ability to reduce header size to one or two lines. Linkify subjects in RSS feeds.</em:description>
<em:creator>Joachim Herb</em:creator>
<em:contributor>Zamula</em:contributor>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git
More information about the Pkg-mozext-commits
mailing list