[Pkg-mozext-commits] [compactheader] 300/441: New version 1.4.6beta1: Fix date format bug if using Thunderbird 10.0a1 (or newer).

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository compactheader.

commit f6d1612b7fce3db9299b84a0c1fcf5f58ec63081
Author: joachim <none at none>
Date:   Sun Nov 6 01:18:50 2011 +0100

    New version 1.4.6beta1: Fix date format bug if using Thunderbird 10.0a1 (or newer).
    
    --HG--
    branch : fix_date_format
---
 chrome/CompactHeader/content/compactHeaderOverlay.js | 19 ++++++++++++-------
 install.rdf                                          |  2 +-
 test/compactheader/test-compactheader-collapse.js    | 19 +++++++++++++++++++
 test/compactheader/test-compactheader-preferences.js |  4 ++--
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 8f4c0c3..d72356b 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -451,13 +451,18 @@ org.mozdev.compactHeader.pane = function() {
     headerEntry.textNode.value = headerValue;
   }
 
-  function coheUpdateDateValue(headerEntry, headerValue) {
+  function coheUpdateDateValue(headerEntry, headerValue, dummy, currentHeaderData) {
     //var t = currentHeaderData.date.headerValue;
-    var d
-    d = document.getElementById("CompactHeader_collapsed1LdateBox");
-    d.textContent = headerValue;
-    d = document.getElementById("CompactHeader_collapsed2LdateBox");
-    d.textContent = headerValue;
+    var d1, d2;
+    d1 = document.getElementById("CompactHeader_collapsed1LdateBox");
+    d2 = document.getElementById("CompactHeader_collapsed2LdateBox");
+    if ("x-mozilla-localizeddate" in currentHeaderData) {
+      d1.textContent = currentHeaderData["x-mozilla-localizeddate"].headerValue;
+      d2.textContent = currentHeaderData["x-mozilla-localizeddate"].headerValue;
+    } else {
+      d1.textContent = headerValue;
+      d2.textContent = headerValue;
+    }
   }
 
 
@@ -487,7 +492,7 @@ org.mozdev.compactHeader.pane = function() {
       }
 
       if (headerEntry) {
-        headerEntry.outputFunction(headerEntry, headerField.headerValue, headerName);
+        headerEntry.outputFunction(headerEntry, headerField.headerValue, headerName, currentHeaderData);
         headerEntry.valid = true;
       }
     }
diff --git a/install.rdf b/install.rdf
index 2cf958b..42154f6 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.5</em:version>
+		<em:version>1.4.6beta1</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 126f63f..de58062 100644
--- a/test/compactheader/test-compactheader-collapse.js
+++ b/test/compactheader/test-compactheader-collapse.js
@@ -171,6 +171,25 @@ function test_address_type_format(){
   }
 }
 
+function test_date_format_collapsed(){
+  let msg = create_message();
+  add_message_to_folder(folder1, msg);
+  select_message_in_folder(folder1, -1, mc);
+
+  expand_and_assert_header(mc);
+  let expandedValue = mc.e("dateLabel").textContent;
+
+  open_preferences_dialog(mc, set_preferences_twoline);
+  mc.sleep(10);
+  collapse_and_assert_header(mc);
+  assert_equals(expandedValue, mc.e("CompactHeader_collapsed2LdateBox").textContent);
+
+  open_preferences_dialog(mc, set_preferences_oneline);
+  collapse_and_assert_header(mc);
+  assert_equals(expandedValue, mc.e("CompactHeader_collapsed1LdateBox").textContent);
+}
+
+
 function set_preferences_twoline(aController) {
   let checkboxCompactTwolineView = aController.eid("CompactHeader_checkboxCompactTwolineView");
   if (!checkboxCompactTwolineView.node.getAttribute("checked")) {
diff --git a/test/compactheader/test-compactheader-preferences.js b/test/compactheader/test-compactheader-preferences.js
index b36a5d3..be07e70 100644
--- a/test/compactheader/test-compactheader-preferences.js
+++ b/test/compactheader/test-compactheader-preferences.js
@@ -124,7 +124,7 @@ function test_double_preference_change_ISO(){
   select_message_in_folder(folder1, 2, mc);
   assert_browser_text_present(mc.e("messagepane"), messageBodyISO8859_1);
   open_preferences_dialog(mc, subtest_change_twoline_linkify);
-  mc.sleep(10);
+  mc.sleep(100);
   assert_browser_text_present(mc.e("messagepane"), messageBodyISO8859_1);
 }
 
@@ -132,7 +132,7 @@ function test_double_preference_change_UTF(){
   select_message_in_folder(folder1, 3, mc);
   assert_browser_text_present(mc.e("messagepane"), messageBodyISO8859_1);
   open_preferences_dialog(mc, subtest_change_twoline_linkify);
-  mc.sleep(10);
+  mc.sleep(100);
   assert_browser_text_present(mc.e("messagepane"), messageBodyISO8859_1);
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git