wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 973932 - Australis' CustomizeMode isn't resetting the currentset attribute on the addon-bar, r=mconley

Browse Source
This commit is contained in:
Gijs Kruitbosch 2014-02-27 13:12:18 +00:00
parent eb4cc632b3
commit ec2f686e3e
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/base/content/browser.xul
View File

@ -971,7 +971,8 @@
</toolbar>
<!-- This is a shim which will go away ASAP. See bug 749804 for details -->
<toolbar id="addon-bar" toolbar-delegate="nav-bar" mode="icons" iconsize="small">
<toolbar id="addon-bar" toolbar-delegate="nav-bar" mode="icons" iconsize="small"
customizable="true">
<hbox id="addonbar-closebutton"/>
<statusbar id="status-bar"/>
</toolbar>

1
browser/components/customizableui/test/browser.ini
View File

@ -69,4 +69,5 @@ skip-if = os == "linux"
[browser_969661_character_encoding_navbar_disabled.js]
[browser_970511_undo_restore_default.js]
[browser_972267_customizationchange_events.js]
[browser_973932_addonbar_currentset.js]
[browser_panel_toggle.js]

30
browser/components/customizableui/test/browser_973932_addonbar_currentset.js Normal file
View File

@ -0,0 +1,30 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
let addonbarID = CustomizableUI.AREA_ADDONBAR;
let addonbar = document.getElementById(addonbarID);
// Check that currentset is correctly updated after a reset:
add_task(function() {
let placements = CustomizableUI.getWidgetIdsInArea(addonbarID);
is(placements.join(','), addonbar.getAttribute("currentset"), "Addon-bar currentset should match default placements");
ok(CustomizableUI.inDefaultState, "Should be in default state");
info("Adding a spring to add-on bar shim");
CustomizableUI.addWidgetToArea("spring", addonbarID, 1);
ok(addonbar.getElementsByTagName("toolbarspring").length, "There should be a spring in the toolbar");
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state");
placements = CustomizableUI.getWidgetIdsInArea(addonbarID);
is(placements.join(','), addonbar.getAttribute("currentset"), "Addon-bar currentset should match placements after spring addition");
yield startCustomizing();
yield gCustomizeMode.reset();
ok(CustomizableUI.inDefaultState, "Should be in default state after reset");
placements = CustomizableUI.getWidgetIdsInArea(addonbarID);
is(placements.join(','), addonbar.getAttribute("currentset"), "Addon-bar currentset should match default placements after reset");
ok(!addonbar.getElementsByTagName("toolbarspring").length, "There should be no spring in the toolbar");
yield endCustomizing();
});