Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Toolbars update.

Browse Source
This commit is contained in:
hyatt%netscape.com 2002-08-06 07:03:36 +00:00
parent f060ebb468
commit 0fbebe085d
4 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -703,8 +703,10 @@ Contributor(s):
</menubar>
<toolbar class="toolbar-primary chromeclass-toolbar" id="nav-bar"
fullscreentoolbar="true" context="toolbar-context-menu">
<toolbarpalette defaultset="back-button,forward-button,reload-button,stop-button,home-button,urlbar-container,go-container,print-button,throbber-box">
fullscreentoolbar="true"
defaultset="back-button,forward-button,reload-button,stop-button,home-button,urlbar-container,go-container,print-button,throbber-box"
context="toolbar-context-menu">
<toolbarpalette>
<toolbarbutton id="back-button" type="menu-button" class="toolbarbutton-1"
label="&backCmd.label;"
oncommand="if (event.target==this) BrowserBack(); else gotoHistoryIndex(event);"

26
browser/base/content/customizeToolbar.js
View File

@ -23,6 +23,8 @@
*/
var gToolbarChanged = false;
var gCurrentDragOverItem = null;
function buildDialog()
@ -191,6 +193,8 @@ var dropObserver = {
toolbar.insertBefore(enclosure, gCurrentDragOverItem);
gCurrentDragOverItem.removeAttribute("dragactive");
gCurrentDragOverItem = null;
gToolbarChanged = true;
},
_flavourSet: null,
getSupportedFlavours: function ()
@ -220,3 +224,25 @@ function cleanUpItemForAdding(aPaletteItem)
aPaletteItem.firstChild.removeAttribute("disabled");
}
}
// Save the changes to the toolbar and update all windows
function updateToolbar()
{
if (!gToolbarChanged)
return;
var toolbar = document.getElementById("cloneToolbar");
var node = toolbar.firstChild;
var newSet = "";
while (node) {
newSet += node.firstChild.id;
node = node.nextSibling;
if (node)
newSet += ",";
}
var toolbar = window.opener.document.getElementById("nav-bar");
toolbar.setAttribute("currentset", newSet);
window.opener.document.persist("nav-bar", "currentset");
}

2
browser/base/content/customizeToolbar.xul
View File

@ -32,7 +32,7 @@
<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/customizeToolbar.css" type="text/css"?>
<dialog id="main-window" onload="buildDialog()"
<dialog id="main-window" onload="buildDialog()" ondialogaccept="updateToolbar()"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript" src="chrome://browser/content/customizeToolbar.js"/>

12
toolkit/content/widgets/toolbar.xml
View File

@ -22,6 +22,12 @@
<method name="buildItemsFromPalette">
<body>
<![CDATA[
var currentSet = this.getAttribute("currentset");
if (!currentSet)
currentSet = this.getAttribute("defaultset");
if (!currentSet)
return;
var node = this.firstChild;
while (node) {
if (node.localName == "toolbarpalette")
@ -35,12 +41,6 @@
this.palette = node;
this.removeChild(node);
var currentSet = node.getAttribute("currentset");
if (!currentSet)
currentSet = node.getAttribute("defaultset");
if (!currentSet)
return;
var items = currentSet.split(",");
for (var i = 0; i < items.length; i++) {
var item = items[i];