[Pkg-mozext-commits] [compactheader] 333/441: Move toolbar only around if necessary. Sort addresses by type in twoline compact header mode.
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:15 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 7ba173c264d45acf221b31f479073bc91853b750
Author: Joachim.Herb at gmx.de <Joachim.Herb at gmx.de>
Date: Thu Mar 1 23:28:31 2012 +0100
Move toolbar only around if necessary. Sort addresses by type in twoline compact
header mode.
---
.../CompactHeader/content/compactHeaderOverlay.js | 12 +++++-
chrome/CompactHeader/content/toolbar.js | 21 +++++++++++
install.rdf | 2 +-
test/compactheader/test-compactheader-collapse.js | 44 +++++++++++++++++++---
4 files changed, 71 insertions(+), 8 deletions(-)
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 89455a3..2da0980 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -530,8 +530,18 @@ org.mozdev.compactHeader.pane = function() {
// 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 keys = [];
+ for (var key in currentHeaderData) {
+ if (currentHeaderData.hasOwnProperty(key)) {
+ keys.push(key);
+ }
+ }
+
+ keys.sort();
+ keys.reverse();
+ for (let i=0; i<keys.length; i++)
{
+ let headerName = keys[i];
var headerField = currentHeaderData[headerName];
var headerEntry = null;
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index 0dc47c5..389ea0d 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -508,8 +508,11 @@ org.mozdev.compactHeader.toolbar = function() {
};
var setToolboxRunning = false;
+ var currentToolboxPosition;
+ var currentToolboxType;
pub.setCurrentToolboxPosition = function(aHeaderViewMode) {
+ var targetType = "single";
if (setToolboxRunning) {
org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition is running");
return;
@@ -522,6 +525,24 @@ org.mozdev.compactHeader.toolbar = function() {
var targetPos = cohePrefBranch.getCharPref("toolbox.position");
var multiMessage = document.getElementById("multimessage");
var multiBBox;
+
+ if (singleMessage && singleMessage.getAttribute("hidden")) {
+ targetType = "multi";
+ }
+
+ if ((currentToolboxPosition == targetPos) &&
+ (currentToolboxType == targetType) &&
+ (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");
+ setToolboxRunning = false;
+ return;
+ }
+
+ currentToolboxPosition = targetPos;
+ currentToolboxType = targetType;
+
if (multiMessage){
org.mozdev.compactHeader.debug.log("multiMessage " + multiMessage);
multiBBox = multiMessage.contentDocument.getElementById("header-view-toolbox");
diff --git a/install.rdf b/install.rdf
index 35ea713..a657b70 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>2.0.2beta2</em:version>
+ <em:version>2.0.2beta3</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>
diff --git a/test/compactheader/test-compactheader-collapse.js b/test/compactheader/test-compactheader-collapse.js
index 5201562..a723a77 100644
--- a/test/compactheader/test-compactheader-collapse.js
+++ b/test/compactheader/test-compactheader-collapse.js
@@ -106,9 +106,21 @@ function setupModule(module) {
}});
add_message_to_folder(folder1, msg);
+
+ let msg = create_message({
+ subject: "This is a short subject.",
+ to: [["T Toe", "t.toe at t.invalid"]],
+ clobberHeaders: {
+ "Bcc": "R Roe <r.roe at r.invalid>",
+ "cc": "S Soe <s.soe at s.invalid>",
+ },
+ });
+
+ add_message_to_folder(folder1, msg);
+
}
-function test_wide_layout_and_compact() {
+function notest_wide_layout_and_compact() {
set_pane_layout(kWideMailLayout);
assert_pane_layout(kWideMailLayout);
let abwc = openAddressBook();
@@ -147,7 +159,7 @@ function test_wide_layout_and_compact() {
mc = open3PaneWindow();
abwc.window.close();
}
-function test_toggle_header_view_twoline(){
+function notest_toggle_header_view_twoline(){
select_message_in_folder(folder1, 0, mc);
open_preferences_dialog(mc, set_preferences_twoline);
mc.sleep(10);
@@ -160,7 +172,7 @@ function test_toggle_header_view_twoline(){
collapse_and_assert_header(mc);
}
-function test_toggle_header_view_oneline(){
+function notest_toggle_header_view_oneline(){
select_message_in_folder(folder1, 0, mc);
open_preferences_dialog(mc, set_preferences_oneline);
mc.sleep(10);
@@ -174,7 +186,7 @@ function test_toggle_header_view_oneline(){
}
-function test_address_type_format(){
+function notest_address_type_format(){
select_message_in_folder(folder1, 1, mc);
open_preferences_dialog(mc, set_preferences_twoline);
mc.sleep(10);
@@ -210,7 +222,7 @@ function test_address_type_format(){
}
}
-function test_date_format_collapsed(){
+function notest_date_format_collapsed(){
let msg = create_message();
add_message_to_folder(folder1, msg);
select_message_in_folder(folder1, -1, mc);
@@ -228,7 +240,7 @@ function test_date_format_collapsed(){
assert_equals(expandedValue, mc.e("CompactHeader_collapsed1LdateBox").textContent);
}
-function test_neighbours_of_header_view_toolbox(){
+function notest_neighbours_of_header_view_toolbox(){
expand_and_assert_header(mc);
mc = reopen_3pane_window();
@@ -262,3 +274,23 @@ function test_neighbours_of_header_view_toolbox(){
assert_equals(oldPreviousSibling, newPreviousSibling);
assert_equals(oldNextSibling, newNextSibling);
}
+
+function test_address_type_order(){
+ select_message_in_folder(folder1, 2, mc);
+ open_preferences_dialog(mc, set_preferences_twoline);
+ mc.sleep(10);
+ collapse_and_assert_header(mc);
+ select_message_in_folder(folder1, 2, mc);
+
+ let toCcBccDescription = mc.a('CompactHeader_collapsed2LtoCcBccBox', {class: "headerValue"});
+ let addrs = toCcBccDescription.getElementsByTagName('mail-emailaddress');
+
+ let currentAddressType = "to";
+ for (let i=0; i<addrs.length; i++) {
+ let addressType = addrs[i].getAttribute("addressType");
+ assert_true((addressType == "to") || (addressType == "cc") || (addressType == "bcc"),
+ "wrong address type");
+ assert_true(addressType <= currentAddressType, "wrong address type order");
+ currentAddressType = addressType;
+ }
+}
--
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