зеркало из https://github.com/mozilla/pjs.git
Make sidebar show up in MailNews.
b=121215; r=morse; sr=alecf; a=asa Make sidebar show up after we retrun from print preview (if it was already displayed), when the windows integration dialog pops up, and when you add or remove tabs via the customize dialog. b=127113; r=morse; sr=hewitt; a=asa
This commit is contained in:
Родитель
d7ac3faec3
Коммит
4e88486cfc
|
@ -650,6 +650,7 @@ var panel_observer = {
|
|||
//debug ("observer: assert");
|
||||
// "refresh" is asserted by select menu and by customize.js.
|
||||
if (prop == RDF.GetResource(NC + "refresh")) {
|
||||
sidebarObj.panels.initialized = false; // reset so panels are put in view
|
||||
sidebarObj.panels.refresh();
|
||||
} else if (prop == RDF.GetResource(NC + "refresh_panel")) {
|
||||
var panel_id = target.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
|
||||
|
@ -1003,6 +1004,7 @@ function SidebarReload() {
|
|||
}
|
||||
|
||||
function SidebarRebuild() {
|
||||
sidebarObj.panels.initialized = false; // reset so panels are brought in view
|
||||
var panels = document.getElementById("sidebar-panels");
|
||||
panels.builder.rebuild();
|
||||
sidebar_open_default_panel(100, 0);
|
||||
|
@ -1112,12 +1114,15 @@ function SidebarShowHide() {
|
|||
|
||||
if (sidebar_is_hidden()) {
|
||||
debug("Showing the sidebar");
|
||||
sidebar_box.removeAttribute('hidden'); // older profiles may have this set
|
||||
|
||||
// for older profiles:
|
||||
sidebar_box.setAttribute('hidden', 'false');
|
||||
sidebar_panels_splitter_box.setAttribute('hidden', 'false');
|
||||
|
||||
sidebar_box.removeAttribute('collapsed');
|
||||
if (sidebar_splitter.getAttribute('state') == 'collapsed')
|
||||
sidebar_splitter.removeAttribute('state');
|
||||
title_box.removeAttribute('hidden');
|
||||
sidebar_panels_splitter_box.removeAttribute('hidden'); // for older profiles
|
||||
sidebar_panels_splitter_box.removeAttribute('collapsed');
|
||||
sidebar_splitter.removeAttribute('hidden');
|
||||
if (sidebar_box.firstChild != sidebar_panels_splitter) {
|
||||
|
|
|
@ -165,13 +165,15 @@
|
|||
<description>&sidebar.no-panels.hide;</description>
|
||||
</vbox>
|
||||
</vbox>
|
||||
<vbox flex="0">
|
||||
<hbox id="nav-buttons-box" hidden="true">
|
||||
<toolbarbutton flex="1" pack="center"
|
||||
class="sidebar-nav-button tab-fwd" onclick="SidebarNavigate(-1);"/>
|
||||
<toolbarbutton flex="1" pack="center"
|
||||
class="sidebar-nav-button tab-back" onclick="SidebarNavigate(1);"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</vbox>
|
||||
<hbox id="nav-buttons-box" hidden="true">
|
||||
<toolbarbutton flex="1" pack="center" class="sidebar-nav-button tab-fwd"
|
||||
onclick="SidebarNavigate(-1);"/>
|
||||
<toolbarbutton flex="1" pack="center" class="sidebar-nav-button tab-back"
|
||||
onclick="SidebarNavigate(1);"/>
|
||||
</hbox>
|
||||
<popupset id="contentAreaContextSet"/>
|
||||
</vbox>
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче