diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 997886832a362240b6428890ccea371ce7bf7dbe..d3cec11797d0e99d2454f6ec9da07f36e802e8b0 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 f23b4218560a34bf85ccfde1d504bbc9b8829a74..6ebf9542a5981975051c374b33accbdeb2d6fa89 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 93e0dd183fdd3f3364bc7ba905e9c97747be59b0..9e30c6ea7df9e9f5362ab31015c63b5648bdb655 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