From 63f1c2d0be1e561baf208ebce5ed2e86a7625820 Mon Sep 17 00:00:00 2001
From: "mozilla.mano%sent.com" <mozilla.mano%sent.com>
Date: Thu, 21 Apr 2005 09:29:59 +0000
Subject: [PATCH] Bug 287885 - Error: redeclaration of const
ADD_BM_DIALOG_FEATURES. r=mconnor, a=asa
---
browser/base/content/browser.js | 15 +++++++++++----
browser/base/content/utilityOverlay.js | 7 -------
browser/components/bookmarks/content/bookmarks.js | 6 ++++++
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 997886832a362..d3cec11797d0e 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -57,6 +57,13 @@ const nsIWebNavigation = nsCI.nsIWebNavigation;
const MAX_HISTORY_MENU_ITEMS = 15;
+// bookmark dialog features
+#ifdef XP_MACOSX
+const BROWSER_ADD_BM_FEATURES = "centerscreen,chrome,dialog,resizable,modal";
+#else
+const BROWSER_ADD_BM_FEATURES = "centerscreen,chrome,dialog,resizable,dependent";
+#endif
+
var gRDF = null;
var gGlobalHistory = null;
var gURIFixup = null;
@@ -1535,7 +1542,7 @@ function addBookmarkForTabBrowser(aTabBrowser, aSelect)
var dialogArgs = currentTabInfo;
dialogArgs.objGroup = tabsInfo;
openDialog("chrome://browser/content/bookmarks/addBookmark2.xul", "",
- ADD_BM_DIALOG_FEATURES, dialogArgs);
+ BROWSER_ADD_BM_FEATURES, dialogArgs);
}
function addBookmarkForBrowser(aDocShell, aIsWebPanel)
@@ -2438,7 +2445,7 @@ var bookmarksButtonObserver = {
url: url
}
openDialog("chrome://browser/content/bookmarks/addBookmark2.xul", "",
- ADD_BM_DIALOG_FEATURES, dialogArgs);
+ BROWSER_ADD_BM_FEATURES, dialogArgs);
}
},
@@ -4649,7 +4656,7 @@ function asyncOpenWebPanel(event)
bWebPanel: true
}
openDialog("chrome://browser/content/bookmarks/addBookmark2.xul", "",
- ADD_BM_DIALOG_FEATURES, dialogArgs);
+ BROWSER_ADD_BM_FEATURES, dialogArgs);
event.preventDefault();
return false;
}
@@ -5486,7 +5493,7 @@ function AddKeywordForSearchField()
description: BookmarksUtils.getDescriptionFromDocument(node.ownerDocument)
}
openDialog("chrome://browser/content/bookmarks/addBookmark2.xul", "",
- ADD_BM_DIALOG_FEATURES, dialogArgs);
+ BROWSER_ADD_BM_FEATURES, dialogArgs);
}
/////////////// livemark handling
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index f23b4218560a3..6ebf9542a5981 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -41,13 +41,6 @@
* for shared application glue for the Communicator suite of applications
**/
-// bookmark dialog features
-#ifdef XP_MACOSX
-const ADD_BM_DIALOG_FEATURES = "centerscreen,chrome,dialog,resizable,modal";
-#else
-const ADD_BM_DIALOG_FEATURES = "centerscreen,chrome,dialog,resizable,dependent";
-#endif
-
var goPrefWindow = 0;
var gBidiUI = false;
diff --git a/browser/components/bookmarks/content/bookmarks.js b/browser/components/bookmarks/content/bookmarks.js
index 93e0dd183fdd3..9e30c6ea7df9e 100644
--- a/browser/components/bookmarks/content/bookmarks.js
+++ b/browser/components/bookmarks/content/bookmarks.js
@@ -36,6 +36,12 @@
#
# ***** END LICENSE BLOCK *****
+#ifdef XP_MACOSX
+const ADD_BM_DIALOG_FEATURES = "centerscreen,chrome,dialog,resizable,modal";
+#else
+const ADD_BM_DIALOG_FEATURES = "centerscreen,chrome,dialog,resizable,dependent";
+#endif
+
var gNC_NS, gWEB_NS, gRDF_NS, gXUL_NS, gNC_NS_CMD;
// definition of the services frequently used for bookmarks
--
GitLab