зеркало из https://github.com/mozilla/pjs.git
Bug #269483 --> remove some obsolete auto update UI
This commit is contained in:
Родитель
8dcb9d1dcc
Коммит
6cc1dae654
|
@ -1728,10 +1728,6 @@
|
|||
<spacer flex="100%"/>
|
||||
</menubar>
|
||||
</toolbaritem>
|
||||
|
||||
<toolbaritem id="softwareupdate-item" title="&updatesItem.title;" align="center" pack="center">
|
||||
<toolbarbutton type="updates" id="softwareupdate" updateCount="0"/>
|
||||
</toolbaritem>
|
||||
</toolbar>
|
||||
|
||||
<toolbarpalette id="MailToolbarPalette">
|
||||
|
|
|
@ -327,23 +327,6 @@ function delayedOnLoadMessageWindow()
|
|||
setTimeout(OnLoadMessageWindowDelayed, 0, loadCustomMessage);
|
||||
|
||||
SetupCommandUpdateHandlers();
|
||||
|
||||
// Ensure the Software Update item is visible on the menubar on Windows and
|
||||
// Linux, and on the navigation toolbar on MacOSX (since we can't put items on
|
||||
// the menubar on OS X)...
|
||||
// We don't use a customizable item for the updates item so we can always be
|
||||
// sure it's present.
|
||||
var updateItem = document.getElementById("softwareupdate-item");
|
||||
updateItem.parentNode.removeChild(updateItem);
|
||||
#ifdef XP_MACOSX
|
||||
var theToolbar = document.getElementById("mail-bar");
|
||||
#else
|
||||
var theToolbar = document.getElementById("toolbar-menubar");
|
||||
#endif
|
||||
if (theToolbar.lastChild.id == "throbber-box")
|
||||
theToolbar.insertBefore(updateItem, document.getElementById("throbber-box"));
|
||||
else
|
||||
theToolbar.appendChild(updateItem);
|
||||
}
|
||||
|
||||
function OnLoadMessageWindowDelayed(loadCustomMessage)
|
||||
|
|
|
@ -845,24 +845,6 @@ function delayedOnLoadMessenger()
|
|||
|
||||
var toolbarset = document.getElementById('customToolbars');
|
||||
toolbox.toolbarset = toolbarset;
|
||||
|
||||
// Ensure the Software Update item is visible on the menubar on Windows and
|
||||
// Linux, and on the navigation toolbar on MacOSX (since we can't put items on
|
||||
// the menubar on OS X)...
|
||||
// We don't use a customizable item for the updates item so we can always be
|
||||
// sure it's present.
|
||||
var updateItem = document.getElementById("softwareupdate-item");
|
||||
updateItem.parentNode.removeChild(updateItem);
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
var theToolbar = document.getElementById("mail-bar");
|
||||
#else
|
||||
var theToolbar = document.getElementById("mail-toolbar-menubar");
|
||||
#endif
|
||||
if (theToolbar.lastChild.id == "throbber-box")
|
||||
theToolbar.insertBefore(updateItem, document.getElementById("throbber-box"));
|
||||
else
|
||||
theToolbar.appendChild(updateItem);
|
||||
}
|
||||
|
||||
function OnUnloadMessenger()
|
||||
|
|
Загрузка…
Ссылка в новой задаче