[Pkg-mozext-commits] [compactheader] 346/441: Version 2.0.4beta2: Fix bug of missing header toolbar in wide screen mode/compact header mode
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:16 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 80e24f6079d496f67272a4e51260eef80bbefd16
Author: Joachim Herb <Joachim.Herb at gmx.de>
Date: Wed Apr 25 01:04:43 2012 +0200
Version 2.0.4beta2: Fix bug of missing header toolbar in wide screen mode/compact header mode
---
chrome/CompactHeader/content/toolbar.js | 14 ++++++++-
install.rdf | 4 +--
test/compactheader/test-compactheader-toolbar.js | 38 +++++++++++++++++++++++-
3 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index 7ae49e1..0e528ec 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -531,6 +531,8 @@ org.mozdev.compactHeader.toolbar = function() {
targetType = "multi";
}
+ org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition 1");
+
if ((currentToolboxPosition == targetPos) &&
(currentToolboxType == targetType) &&
(currentHeaderViewMode == aHeaderViewMode) &&
@@ -542,13 +544,23 @@ org.mozdev.compactHeader.toolbar = function() {
return;
}
+ org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition 2");
+
currentToolboxPosition = targetPos;
currentToolboxType = targetType;
currentHeaderViewMode = aHeaderViewMode;
+
+ org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition 3");
if (multiMessage){
org.mozdev.compactHeader.debug.log("multiMessage " + multiMessage);
- multiBBox = multiMessage.contentDocument.getElementById("header-view-toolbox");
+ try {
+ multiBBox = multiMessage.contentDocument.getElementById("header-view-toolbox");
+ org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition have multiMessage.contentDocument");
+ }
+ catch (e) {
+ org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition no multiMessage.contentDocument " + e);
+ }
}
org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition mid 0");
diff --git a/install.rdf b/install.rdf
index 354109e..cc6ce5b 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.4beta1</em:version>
+ <em:version>2.0.4beta2</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>
@@ -24,7 +24,7 @@
<RDF:Description>
<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
<em:minVersion>8.0</em:minVersion>
- <em:maxVersion>14.0a1</em:maxVersion>
+ <em:maxVersion>15.0a1</em:maxVersion>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
diff --git a/test/compactheader/test-compactheader-toolbar.js b/test/compactheader/test-compactheader-toolbar.js
index 0d23489..907e16d 100644
--- a/test/compactheader/test-compactheader-toolbar.js
+++ b/test/compactheader/test-compactheader-toolbar.js
@@ -669,12 +669,49 @@ function test_visible_toolbar() {
expand_and_assert_header(mc);
let toolbar = mc.eid("header-view-toolbar").node;
assert_equals(isVisible(toolbar), true);
+
+ set_pane_layout(kWideMailLayout);
+ assert_pane_layout(kWideMailLayout);
+ let abwc = openAddressBook();
+ // The 3pane window is closed and opened again.
+ close3PaneWindow();
+
+ mc = open3PaneWindow();
+ abwc.window.close();
+
+ mc.sleep(10);
+
+ collapse_and_assert_header(mc);
+ let toolbar = mc.eid("header-view-toolbar").node;
+ assert_equals(isVisible(toolbar), true);
+ expand_and_assert_header(mc);
+ let toolbar = mc.eid("header-view-toolbar").node;
+ assert_equals(isVisible(toolbar), true);
+
+ set_pane_layout(kClassicMailLayout);
+ assert_pane_layout(kClassicMailLayout);
+ let abwc = openAddressBook();
+ // The 3pane window is closed and opened again.
+ close3PaneWindow();
+
+ mc = open3PaneWindow();
+ abwc.window.close();
+
}
/**
* Test header pane toolbar position
*/
function test_set_toolbar_position() {
+ set_pane_layout(kClassicMailLayout);
+ assert_pane_layout(kClassicMailLayout);
+ let abwc = openAddressBook();
+ // The 3pane window is closed and opened again.
+ close3PaneWindow();
+
+ mc = open3PaneWindow();
+ abwc.window.close();
+
select_message_in_folder(folder1, 0, mc);
expand_and_assert_header(mc);
restore_and_check_default_buttons(mc);
@@ -765,7 +802,6 @@ function test_set_toolbar_position() {
}
-
/**
* Check all buttons in the toolbar for the correct style
* of text and icon.
--
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