[Pkg-mozext-commits] [compactheader] 343/441: Version 2.0.3 Fixing hidden header toolbar after toggling.
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 455d42b4cf3b3a30dd5fefc07cb8636ba65808d7
Author: Joachim Herb <Joachim.Herb at gmx.de>
Date: Fri Apr 6 02:05:14 2012 +0200
Version 2.0.3 Fixing hidden header toolbar after toggling.
---
chrome/CompactHeader/content/toolbar.js | 5 +++-
install.rdf | 2 +-
test/compactheader/test-compactheader-collapse.js | 12 ++++-----
test/compactheader/test-compactheader-toolbar.js | 33 ++++++++++++++++++++++-
4 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index 389ea0d..7ae49e1 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -510,6 +510,7 @@ org.mozdev.compactHeader.toolbar = function() {
var setToolboxRunning = false;
var currentToolboxPosition;
var currentToolboxType;
+ var currentHeaderViewMode;
pub.setCurrentToolboxPosition = function(aHeaderViewMode) {
var targetType = "single";
@@ -532,6 +533,7 @@ org.mozdev.compactHeader.toolbar = function() {
if ((currentToolboxPosition == targetPos) &&
(currentToolboxType == targetType) &&
+ (currentHeaderViewMode == aHeaderViewMode) &&
(targetType == "single")) {
org.mozdev.compactHeader.debug.log("curPos: " + currentToolboxPosition + " targetPos: " + targetPos);
org.mozdev.compactHeader.debug.log("curType: " + currentToolboxType + " targetType: " + targetType);
@@ -542,7 +544,8 @@ org.mozdev.compactHeader.toolbar = function() {
currentToolboxPosition = targetPos;
currentToolboxType = targetType;
-
+ currentHeaderViewMode = aHeaderViewMode;
+
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 c8c2eb8..5561631 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.3beta2</em:version>
+ <em:version>2.0.3</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 a723a77..1ca96cc 100644
--- a/test/compactheader/test-compactheader-collapse.js
+++ b/test/compactheader/test-compactheader-collapse.js
@@ -120,7 +120,7 @@ function setupModule(module) {
}
-function notest_wide_layout_and_compact() {
+function test_wide_layout_and_compact() {
set_pane_layout(kWideMailLayout);
assert_pane_layout(kWideMailLayout);
let abwc = openAddressBook();
@@ -159,7 +159,7 @@ function notest_wide_layout_and_compact() {
mc = open3PaneWindow();
abwc.window.close();
}
-function notest_toggle_header_view_twoline(){
+function test_toggle_header_view_twoline(){
select_message_in_folder(folder1, 0, mc);
open_preferences_dialog(mc, set_preferences_twoline);
mc.sleep(10);
@@ -172,7 +172,7 @@ function notest_toggle_header_view_twoline(){
collapse_and_assert_header(mc);
}
-function notest_toggle_header_view_oneline(){
+function test_toggle_header_view_oneline(){
select_message_in_folder(folder1, 0, mc);
open_preferences_dialog(mc, set_preferences_oneline);
mc.sleep(10);
@@ -186,7 +186,7 @@ function notest_toggle_header_view_oneline(){
}
-function notest_address_type_format(){
+function test_address_type_format(){
select_message_in_folder(folder1, 1, mc);
open_preferences_dialog(mc, set_preferences_twoline);
mc.sleep(10);
@@ -222,7 +222,7 @@ function notest_address_type_format(){
}
}
-function notest_date_format_collapsed(){
+function test_date_format_collapsed(){
let msg = create_message();
add_message_to_folder(folder1, msg);
select_message_in_folder(folder1, -1, mc);
@@ -240,7 +240,7 @@ function notest_date_format_collapsed(){
assert_equals(expandedValue, mc.e("CompactHeader_collapsed1LdateBox").textContent);
}
-function notest_neighbours_of_header_view_toolbox(){
+function test_neighbours_of_header_view_toolbox(){
expand_and_assert_header(mc);
mc = reopen_3pane_window();
diff --git a/test/compactheader/test-compactheader-toolbar.js b/test/compactheader/test-compactheader-toolbar.js
index 2780090..de8e42f 100644
--- a/test/compactheader/test-compactheader-toolbar.js
+++ b/test/compactheader/test-compactheader-toolbar.js
@@ -40,7 +40,7 @@ var MODULE_NAME = 'test-compactheader-toolbar';
var RELATIVE_ROOT = '../shared-modules';
var MODULE_REQUIRES = ['folder-display-helpers', 'window-helpers',
'address-book-helpers', 'mouse-event-helpers',
- 'compactheader-helpers'];
+ 'dom-helpers', 'compactheader-helpers'];
var elib = {};
Cu.import('resource://mozmill/modules/elementslib.js', elib);
@@ -63,6 +63,8 @@ function setupModule(module) {
meh.installInto(module);
let chh = collector.getModule('compactheader-helpers');
chh.installInto(module);
+ let domh = collector.getModule('dom-helpers');
+ domh.installInto(module);
// Get rid of possibly showing up lightning import wizard
let wizard = Services.wm.getMostRecentWindow("Calendar:MigrationWizard");
@@ -652,6 +654,24 @@ function test_customize_header_toolbar_change_button_style(){
}
/**
+ * Test header pane toolbar visible after toggling
+ */
+function test_visible_toolbar() {
+ select_message_in_folder(folder1, 1, mc);
+ expand_and_assert_header(mc);
+ set_and_assert_toolbox_position(mc, 'top');
+ let toolbar = mc.eid("header-view-toolbar").node;
+ assert_equals(isVisible(toolbar), true);
+ open_preferences_dialog(mc, subtest_change_twoline);
+ 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);
+}
+
+/**
* Test header pane toolbar position
*/
function test_set_toolbar_position() {
@@ -768,3 +788,14 @@ function subtest_buttons_style(aIconVisibility, aLabelVisibility)
}
}
+function isVisible(aElem) {
+ if (aElem.hidden || aElem.collapsed)
+ return false;
+ let parent = aElem.parentNode;
+ if (parent == null)
+ return true;
+ if (("selectedPanel" in parent) &&
+ parent.selectedPanel != aElem)
+ return false;
+ return isVisible(parent);
+}
\ No newline at end of file
--
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