[Pkg-mozext-commits] [compactheader] 155/441: New version 1.2.0beta2: Should fix header toggle problem after switching layouts.
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:28:54 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 99639fc546e5b8f2651f52679b2da96d88becbcb
Author: joachim.herb <none at none>
Date: Mon May 3 21:15:30 2010 +0000
New version 1.2.0beta2:
Should fix header toggle problem after switching layouts.
---
chrome.manifest | 8 +-
.../content-31/customizeToolbarOverlay.xul | 15 ----
chrome/CompactHeader/content-31/preferences.js | 100 ---------------------
chrome/CompactHeader/content-31/preferences.xul | 38 --------
.../CompactHeader/content/compactHeaderOverlay.js | 9 +-
5 files changed, 10 insertions(+), 160 deletions(-)
diff --git a/chrome.manifest b/chrome.manifest
index 23168d5..1d00d17 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -16,8 +16,9 @@ style chrome://global/content/customizeToolbar.xul chrome://messenger/skin
style chrome://global/content/customizeToolbar.xul chrome://CustomizeHeaderToolbar/skin/messageHeader.css appversion<3.1a1pre
style chrome://global/content/customizeToolbar.xul chrome://CustomizeHeaderToolbar-os/skin/messageHeader.css appversion<3.1a1pre
-content CompactHeader chrome/CompactHeader/content/ appversion<3.1a1pre
-content CompactHeader chrome/CompactHeader/content-31/ appversion>=3.1b2
+content CompactHeader chrome/CompactHeader/content/
+content CompactHeader-d chrome/CompactHeader/content/ appversion<3.1a1pre
+content CompactHeader-d chrome/CompactHeader/content-31/ appversion>=3.1b2
skin CompactHeader global chrome/CompactHeader/skin/global/
skin CompactHeader-os classic/1.0 chrome/CompactHeader/skin/common/
@@ -29,7 +30,7 @@ locale CompactHeader en-US chrome/CompactHeader/locale/en-US/
locale CompactHeader de-DE chrome/CompactHeader/locale/de-DE/
locale CompactHeader it-IT chrome/CompactHeader/locale/it-IT/
-overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay.xul
+overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader-d/content/compactHeaderOverlay.xul
overlay chrome://global/content/customizeToolbar.xul chrome://CompactHeader/content/customizeToolbarOverlay.xul
style chrome://global/content/customizeToolbar.xul chrome://CompactHeader-os/skin/osdef.css
style chrome://global/content/customizeToolbar.xul chrome://CompactHeader/skin/CompactHeader.css
@@ -38,3 +39,4 @@ overlay chrome://messenger/content/messageWindow.xul chrome://CompactHeader/
overlay chrome://messenger/content/messenger.xul chrome://CompactHeader/content/buttonsOverlay.xul
style chrome://global/content/customizeToolbar.xul chrome://CompactHeader-os/skin/buttonsOverlay.css
+overlay chrome://messenger/content/messenger.xul chrome://CompactHeader/content/messengerOverlay.xul appversion<3.1a1pre
diff --git a/chrome/CompactHeader/content-31/customizeToolbarOverlay.xul b/chrome/CompactHeader/content-31/customizeToolbarOverlay.xul
deleted file mode 100644
index a9324a1..0000000
--- a/chrome/CompactHeader/content-31/customizeToolbarOverlay.xul
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" ?>
-
-<!DOCTYPE overlay [
-<!ENTITY % customizeToolbarDTD SYSTEM "chrome://global/locale/customizeToolbar.dtd">
- %customizeToolbarDTD;
-]>
-
-<?xml-stylesheet href="chrome://CompactHeader-os/skin/osdef.css" type="text/css"?>
-
-<overlay id="customizeToolbarOverlay"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
- <script type="application/javascript" src="chrome://CompactHeader/content/compactHeaderOverlay.js"/>
-
-</overlay>
diff --git a/chrome/CompactHeader/content-31/preferences.js b/chrome/CompactHeader/content-31/preferences.js
deleted file mode 100644
index 8c718b2..0000000
--- a/chrome/CompactHeader/content-31/preferences.js
+++ /dev/null
@@ -1,100 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-// preferences.js
-//
-// Copyright 2005 by Michael Buschbeck <michael at buschbeck.net>
-//
-// Preferences dialog box for the Unselect Message extension. Allows users to
-// customize the behavior of the extension.
-//
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Variables
-//
-
-
-if(!org) var org={};
-if(!org.mozdev) org.mozdev={};
-if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
-
-org.mozdev.compactHeader.preferences = function() {
- var pub = {};
- var prefBranch;
- ///////////////////////////////////////////////////////////////////////////////
- //
- // onLoad
- //
- // Called when the preferences dialog has finished loading. Initializes the
- // controls according to current configuration settings.
- //
-
- pub.onLoad = function()
- {
- prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefService)
- .getBranch("extensions.CompactHeader.");
-
- loadPrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
- loadPrefCheckbox("headersize.linkify", "checkbox.Linkify");
- //loadPrefInt("headersize.addressstyle", "AddressStyle");
- loadPrefCheckbox("headersize.addressstyle", "checkbox.ShowOnlyAddress");
- loadPrefCheckbox("headersize.flatButtons", "checkbox.flatButtons");
- }
-
- ///////////////////////////////////////////////////////////////////////////////
- //
- // onDialogAccept
- //
- // Called when the preferences dialog is closed by pressing the OK button.
- // Saves the configuration settings.
- //
-
- pub.onDialogAccept = function ()
- {
- savePrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
- savePrefCheckbox("headersize.linkify", "checkbox.Linkify");
- //savePrefInt("headersize.addressstyle", "AddressStyle");
- savePrefCheckbox("headersize.addressstyle", "checkbox.ShowOnlyAddress");
- savePrefCheckbox("headersize.flatButtons", "checkbox.flatButtons");
- return true;
- }
-
-
- ///////////////////////////////////////////////////////////////////////////////
- //
- // loadPrefCheckbox
- //
- // Loads the given boolean preference value into the given checkbox element.
- //
-
- function loadPrefCheckbox(pref, idCheckbox)
- {
- document.getElementById(idCheckbox).checked = prefBranch.getBoolPref(pref);
- }
-
-
- function loadPrefInt(pref, idCheckbox)
- {
- document.getElementById(idCheckbox).value = prefBranch.getIntPref(pref);
- }
-
- ///////////////////////////////////////////////////////////////////////////////
- //
- // savePrefCheckbox
- //
- // Saves the given boolean preference value from the given checkbox element.
- //
-
- function savePrefCheckbox(pref, idCheckbox)
- {
- prefBranch.setBoolPref(pref, document.getElementById(idCheckbox).checked);
- }
-
- function savePrefInt(pref, idCheckbox)
- {
- prefBranch.setIntPref(pref, document.getElementById(idCheckbox).value);
- }
- return pub;
-}();
diff --git a/chrome/CompactHeader/content-31/preferences.xul b/chrome/CompactHeader/content-31/preferences.xul
deleted file mode 100644
index f17eb34..0000000
--- a/chrome/CompactHeader/content-31/preferences.xul
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
-<?xml-stylesheet type="text/css" href="chrome://communicator/skin/"?>
-<?xml-stylesheet type="text/css" href="chrome://CompactHeader/skin/preferences.css"?>
-
-<!DOCTYPE window [
-<!ENTITY % CompactHeaderDTD SYSTEM "chrome://CompactHeader/locale/preferences.dtd">
-%CompactHeaderDTD;
-<!ENTITY % msgHdrDTD SYSTEM "chrome://messenger/locale/msgHdrViewOverlay.dtd">
-%msgHdrDTD;
-<!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd">
-%messengerDTD;
-]>
-
-<!--
- void(openDialog("chrome://CompactHeader/content/preferences.xul"))
--->
-
-<dialog id="cohePreferences"
- title="&dialog.title;"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- onload="org.mozdev.compactHeader.preferences.onLoad();"
- ondialogaccept="return org.mozdev.compactHeader.preferences.onDialogAccept();">
-
- <script type="application/x-javascript" src="chrome://CompactHeader/content/preferences.js"/>
-
- <checkbox id="checkbox.Compact.TwolineView"
- label="&checkbox.Compact.TwolineView.caption;"/>
-
- <checkbox id="checkbox.Linkify"
- label="&menu.Linkify.caption;"/>
- <checkbox id="checkbox.ShowOnlyAddress"
- label="&menu.ShowOnlyAddress.caption;"/>
- <checkbox id="checkbox.flatButtons"
- label="&menu.flatButtons.caption;"/>
-
-</dialog>
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 22a4e50..ab37d99 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -75,7 +75,7 @@ org.mozdev.compactHeader.pane = function() {
var gCoheCollapsedHeader1LListLongAddresses = [
{name:"subject", outputFunction:coheOutputSubject},
{name:"from", useToggle:true, outputFunction:coheOutputEmailAddresses},
- {name:"toCcBcc", useToggle:true, outputFunction:coheOutputEmailAddresses},
+// {name:"toCcBcc", useToggle:true, outputFunction:coheOutputEmailAddresses},
{name:"date", outputFunction:coheUpdateDateValue}
];
@@ -148,14 +148,15 @@ org.mozdev.compactHeader.pane = function() {
} else {
address.displayName = names.value[index];
}
- if (headerEntry.useToggle)
+ if (headerEntry.useToggle && (typeof headerEntry.enclosingBox.addAddressView == 'function')) {
headerEntry.enclosingBox.addAddressView(address);
- else
+ } else {
updateEmailAddressNode(headerEntry.enclosingBox.emailAddressNode, address);
+ }
index++;
}
- if (headerEntry.useToggle)
+ if (headerEntry.useToggle && (typeof headerEntry.enclosingBox.buildViews == 'function'))
headerEntry.enclosingBox.buildViews();
//OutputEmailAddresses(headerEntry, emailAddresses);
}
--
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