[Pkg-mozext-commits] [compactheader] 182/441: Version 1.3.0beta3: Bugfixes: - Linkify subject causes internal crash. - Flex bugs in tabview - Store size of preview pane correctly?!?
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:28:57 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 a464a436966b0c93296e48a4366b5ae2925935ef
Author: joachim.herb <none at none>
Date: Tue Sep 28 20:06:50 2010 +0000
Version 1.3.0beta3:
Bugfixes:
- Linkify subject causes internal crash.
- Flex bugs in tabview
- Store size of preview pane correctly?!?
---
.../CompactHeader/content/compactHeaderOverlay.js | 60 +++++++++++++++++++---
.../CompactHeader/skin/common/buttonsOverlay.css | 3 ++
chrome/CompactHeader/skin/gnome/buttonsOverlay.css | 3 ++
chrome/CompactHeader/skin/mac/buttonsOverlay.css | 4 ++
.../CompactHeader/skin/windows/buttonsOverlay.css | 4 ++
install.rdf | 2 +-
6 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 4b434fb..d79b1cf 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -65,6 +65,7 @@ org.mozdev.compactHeader.pane = function() {
// links : /((\w+):\/\/[^<>()'"\s]+|www(\.[-\w]+){2,})/
// };
//
+
var gCoheCollapsedHeaderViewMode = false;
var gCoheBuiltCollapsedView = false;
@@ -111,8 +112,12 @@ org.mozdev.compactHeader.pane = function() {
];
var cohePrefBranch = Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefService)
- .getBranch("extensions.CompactHeader.");
+ .getService(Components.interfaces.nsIPrefService)
+ .getBranch("extensions.CompactHeader.");
+
+ var extraPrefBranch = Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefService)
+ .getBranch("general.useragent.extra.");
var timerSwapBrowsers = Components.classes["@mozilla.org/timer;1"]
.createInstance(Components.interfaces.nsITimer);
@@ -235,6 +240,7 @@ org.mozdev.compactHeader.pane = function() {
}
pub.coheOnLoadMsgHeaderPane = function() {
+ debugLog("start coheOnLoadMsgHeaderPane");
createSidebars();
coheInitializeHeaderViewTables();
@@ -251,6 +257,11 @@ org.mozdev.compactHeader.pane = function() {
var messagePaneBox = document.getElementById("messagepanebox");
messagePaneBox.addEventListener("DOMAttrModified", onCollapsedChangeMessagePaneBox, false);
+
+ var displayDeck = document.getElementById("displayDeck");
+ if (displayDeck) {
+ displayDeck.addEventListener("DOMAttrModified", onCollapsedChangeDisplayDeck, false);
+ }
var dispMUAicon = document.getElementById("dispMUAicon");
if (dispMUAicon) {
@@ -258,10 +269,11 @@ org.mozdev.compactHeader.pane = function() {
}
var headerToolbar = document.getElementById("header-view-toolbar");
- if (dispMUAicon) {
+ if (headerToolbar) {
headerToolbar.addEventListener("DOMAttrModified", onChangeHeaderToolbar, false);
}
+ debugLog("mid coheOnLoadMsgHeaderPane 1");
gCoheCollapsedHeaderViewMode =
deckHeaderView.selectedPanel == document.getElementById('collapsedHeaderView');
@@ -281,6 +293,7 @@ org.mozdev.compactHeader.pane = function() {
document.getElementById('collapsed2LHeadersBox').collapsed = true;
}
+ debugLog("mid coheOnLoadMsgHeaderPane 2");
if (coheFirstTime)
{
coheFirstTime = false;
@@ -299,6 +312,8 @@ org.mozdev.compactHeader.pane = function() {
org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
};
}
+
+ debugLog("mid coheOnLoadMsgHeaderPane 3");
if (cohe.firstrun) {
coheCheckFirstRun();
@@ -321,10 +336,12 @@ org.mozdev.compactHeader.pane = function() {
}
}
+ debugLog("mid coheOnLoadMsgHeaderPane 4");
setButtonStyle();
org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
delayedCurrentToolboxPosition(200);
//coheToggleHeaderContent();
+ debugLog("stop coheOnLoadMsgHeaderPane");
}
var coheMessageListener =
@@ -470,8 +487,8 @@ org.mozdev.compactHeader.pane = function() {
}
if (RSSLinkify.oldSubject) {
RSSLinkify.oldSubject.setAttribute("collapsed", "false");
+ RSSLinkify.oldSubject.setAttribute("tooltiptext", currentHeaderData["subject"].headerValue);
}
- RSSLinkify.oldSubject.setAttribute("tooltiptext", currentHeaderData["subject"].headerValue);
}
if (cohePrefBranch.getBoolPref("headersize.addressstyle")) {
selectEmailDisplayed();
@@ -1003,22 +1020,27 @@ org.mozdev.compactHeader.pane = function() {
return;
}
+ var debugLevel = gCurrentLogLevel;
cohe.current = cohe.gExtensionManager.getItemForID(COHE_EXTENSION_UUID).version;
try{
cohe.version = cohePrefBranch.getCharPref("version");
cohe.firstrun = cohePrefBranch.getBoolPref("firstrun");
+ debugLevel = cohePrefBranch.getIntPref("debugLevel");
} catch(e) {
} finally {
//check for first run
if (cohe.firstrun){
cohePrefBranch.setBoolPref("firstrun",false);
cohePrefBranch.setCharPref("version",cohe.current);
+ extraPrefBranch.setCharPref("CompactHeader", "CompcatHeader/" + cohe.current);
}
//check for upgrade
if (cohe.version!=cohe.current && !cohe.firstrun){
cohePrefBranch.setCharPref("version",cohe.current);
- // XXX
+ extraPrefBranch.setCharPref("CompactHeader", "CompcatHeader/" + cohe.current);
}
+ gCurrentLogLevel = debugLevel;
+ cohePrefBranch.setIntPref("debugLevel", gCurrentLogLevel);
}
}
else {
@@ -1039,11 +1061,12 @@ org.mozdev.compactHeader.pane = function() {
if (cohe.firstrun){
cohePrefBranch.setBoolPref("firstrun",false);
cohePrefBranch.setCharPref("version",cohe.current);
+ extraPrefBranch.setCharPref("CompactHeader", "CompcatHeader/" + cohe.current);
}
//check for upgrade
if (cohe.version!=cohe.current && !cohe.firstrun){
cohePrefBranch.setCharPref("version",cohe.current);
- // XXX
+ extraPrefBranch.setCharPref("CompactHeader", "CompcatHeader/" + cohe.current);
}
}
}
@@ -1069,7 +1092,7 @@ org.mozdev.compactHeader.pane = function() {
//if ((gExtensionManager.getItemForID(COHE_EXTENSION_UUID) == null) || isAddonDisabled(COHE_EXTENSION_UUID)) {
// return;
//}
-
+
coheUninstallObserver.register();
}
@@ -1147,6 +1170,8 @@ org.mozdev.compactHeader.pane = function() {
xul12.id = "rightToolbox";
messagePaneHBox.appendChild(xul12);
+ messagePaneHBox.addEventListener("DOMAttrModified", onHeightChangeMessagePaneHBox, false);
+
debugLog("createSidebars stop");
};
@@ -1156,6 +1181,13 @@ org.mozdev.compactHeader.pane = function() {
}
};
+ function onHeightChangeMessagePaneHBox(event) {
+ if (event.attrName == "height") {
+ var height = document.getElementById("messagepanebox").boxObject.height;
+ document.getElementById("messagepanebox").setAttribute("height", height);
+ }
+ };
+
function onCollapsedChangeMessagePaneBox(event) {
if (event.attrName == "collapsed") {
if (document.getElementById("messagepanebox").getAttribute("collapsed") == "true") {
@@ -1167,6 +1199,19 @@ org.mozdev.compactHeader.pane = function() {
}
};
+ function onCollapsedChangeDisplayDeck(event) {
+ if (event.attrName == "collapsed") {
+ var displayDeck = document.getElementById("displayDeck");
+ if (!displayDeck || displayDeck.getAttribute("collapsed") == "true") {
+ document.getElementById("messagepanehbox").setAttribute("flex", "1");
+ }
+ else {
+ //alert("no flex!");
+ document.getElementById("messagepanehbox").removeAttribute("flex");
+ }
+ }
+ }
+
function onChangeDispMUAicon(event) {
if (event.attrName == "src") {
var imageSrc = document.getElementById("dispMUAicon").getAttribute("src");
@@ -1280,6 +1325,7 @@ org.mozdev.compactHeader.pane = function() {
debugLog("uninstalling COHE 2");
if (this._uninstall) {
cohePrefBranch.deleteBranch("");
+ extraPrefBranch.deleteBranch("CompactHeader");
org.mozdev.customizeHeaderToolbar.pane.CHTCleanupButtons();
}
this.unregister();
diff --git a/chrome/CompactHeader/skin/common/buttonsOverlay.css b/chrome/CompactHeader/skin/common/buttonsOverlay.css
index fb2289f..7287c23 100644
--- a/chrome/CompactHeader/skin/common/buttonsOverlay.css
+++ b/chrome/CompactHeader/skin/common/buttonsOverlay.css
@@ -62,3 +62,6 @@ toolbar[iconsize="small"] #button-dispMUA .toolbarbutton-icon {
height:18px;
}
+#expandedHeadersBox #button-dispMUA {
+ display: none;
+}
diff --git a/chrome/CompactHeader/skin/gnome/buttonsOverlay.css b/chrome/CompactHeader/skin/gnome/buttonsOverlay.css
index 4dbfd03..cd75332 100644
--- a/chrome/CompactHeader/skin/gnome/buttonsOverlay.css
+++ b/chrome/CompactHeader/skin/gnome/buttonsOverlay.css
@@ -78,3 +78,6 @@ toolbar[iconsize="small"] #button-dispMUA .toolbarbutton-icon {
height:18px;
}
+#expandedHeadersBox #button-dispMUA {
+ display: none;
+}
diff --git a/chrome/CompactHeader/skin/mac/buttonsOverlay.css b/chrome/CompactHeader/skin/mac/buttonsOverlay.css
index 369a1dc..3e1a838 100644
--- a/chrome/CompactHeader/skin/mac/buttonsOverlay.css
+++ b/chrome/CompactHeader/skin/mac/buttonsOverlay.css
@@ -77,3 +77,7 @@ toolbar[iconsize="small"] #button-dispMUA .toolbarbutton-icon {
width:24px;
height:24px;
}
+
+#expandedHeadersBox #button-dispMUA {
+ display: none;
+}
diff --git a/chrome/CompactHeader/skin/windows/buttonsOverlay.css b/chrome/CompactHeader/skin/windows/buttonsOverlay.css
index 738211a..7427e9a 100644
--- a/chrome/CompactHeader/skin/windows/buttonsOverlay.css
+++ b/chrome/CompactHeader/skin/windows/buttonsOverlay.css
@@ -67,3 +67,7 @@ toolbar[iconsize="small"] #button-dispMUA .toolbarbutton-icon {
width:18px;
height:18px;
}
+
+#expandedHeadersBox #button-dispMUA {
+ display: none;
+}
diff --git a/install.rdf b/install.rdf
index de97a2d..b940749 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.3.0beta2</em:version>
+ <em:version>1.3.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>
--
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