From d78211f28ba51312899df94a42e9396ea68d9cfa Mon Sep 17 00:00:00 2001 From: "hyatt%mozilla.org" Date: Sun, 10 Aug 2003 22:48:52 +0000 Subject: [PATCH] Fix for 173444, custom toolbars show up (incorrectly) in popup windows. git-svn-id: svn://10.0.0.236/trunk@145850 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/content/customizeToolbar.js | 2 +- mozilla/toolkit/content/widgets/toolbar.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mozilla/toolkit/content/customizeToolbar.js b/mozilla/toolkit/content/customizeToolbar.js index 41d5c2aa42b..df89f84c128 100644 --- a/mozilla/toolkit/content/customizeToolbar.js +++ b/mozilla/toolkit/content/customizeToolbar.js @@ -529,7 +529,7 @@ function addNewToolbar() // if a conflict is found var nameToId = "__customToolbar_" + name.value.replace(" ", ""); var existingToolbar = gToolboxDocument.getElementById(nameToId); - if (existingToolbar || !name.value) { + if (existingToolbar) { message = stringBundle.getFormattedString("enterToolbarDup", [name.value]); } else { break; diff --git a/mozilla/toolkit/content/widgets/toolbar.xml b/mozilla/toolkit/content/widgets/toolbar.xml index e24fdd728ce..b3d2afb27de 100644 --- a/mozilla/toolkit/content/widgets/toolbar.xml +++ b/mozilla/toolkit/content/widgets/toolbar.xml @@ -72,7 +72,8 @@ toolbar.setAttribute("mode", this.getAttribute("mode")); toolbar.setAttribute("iconsize", this.getAttribute("iconsize")); toolbar.setAttribute("context", this.toolbarset.getAttribute("context")); - + toolbar.setAttribute("class", "chromeclass-toolbar"); + this.insertBefore(toolbar, this.toolbarset); return toolbar; ]]>