From 7756991bf5963dc0c144db56dba9bc7440cdf9c8 Mon Sep 17 00:00:00 2001 From: "joshmoz%gmail.com" Date: Wed, 13 Feb 2008 02:49:29 +0000 Subject: [PATCH] disable "always raised" "feature" of help on Mac OS X. We'd need a more robust z-level impl for this to work and that is too difficult for this late in the game (Apple bug makes it hard). b=404283 r=mano ui-r=beltzner git-svn-id: svn://10.0.0.236/trunk@245538 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/components/help/content/contextHelp.js | 7 +++++++ mozilla/toolkit/components/help/content/help.js | 7 ++----- mozilla/toolkit/components/help/content/help.xul | 3 --- .../toolkit/components/help/content/helpContextOverlay.xul | 3 --- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/mozilla/toolkit/components/help/content/contextHelp.js b/mozilla/toolkit/components/help/content/contextHelp.js index 04593d011b4..3674fa8c389 100644 --- a/mozilla/toolkit/components/help/content/contextHelp.js +++ b/mozilla/toolkit/components/help/content/contextHelp.js @@ -65,7 +65,14 @@ function openHelp(topic, contentPack) params.SetString(1, topic); const ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] .getService(Components.interfaces.nsIWindowWatcher); +#ifdef XP_WIN +#define HELP_ALWAYS_RAISED_TOGGLE +#endif +#ifdef HELP_ALWAYS_RAISED_TOGGLE ww.openWindow(null, "chrome://help/content/help.xul", "_blank", "chrome,all,alwaysRaised,dialog=no", params); +#else + ww.openWindow(null, "chrome://help/content/help.xul", "_blank", "chrome,all,dialog=no", params); +#endif } } diff --git a/mozilla/toolkit/components/help/content/help.js b/mozilla/toolkit/components/help/content/help.js index 2cf25fe997a..d145ce303ce 100644 --- a/mozilla/toolkit/components/help/content/help.js +++ b/mozilla/toolkit/components/help/content/help.js @@ -785,13 +785,10 @@ function getXulWin() } # toggleZLevel - Toggles whether or not the window will always appear on top. Because -# alwaysRaised is not supported on an OS other than Windows and Mac OS X, this code -# will not appear in those builds. +# alwaysRaised is not supported on an OS other than Windows, this code will not +# appear in those builds. # # element - The DOM node that persists the checked state. -#ifdef XP_MACOSX -#define HELP_ALWAYS_RAISED_TOGGLE -#endif #ifdef XP_WIN #define HELP_ALWAYS_RAISED_TOGGLE #endif diff --git a/mozilla/toolkit/components/help/content/help.xul b/mozilla/toolkit/components/help/content/help.xul index fe833e9162e..5a34e98c689 100644 --- a/mozilla/toolkit/components/help/content/help.xul +++ b/mozilla/toolkit/components/help/content/help.xul @@ -55,9 +55,6 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" width="700" height="550" -#ifdef XP_MACOSX -#define HELP_ALWAYS_RAISED_TOGGLE -#endif #ifdef XP_WIN #define HELP_ALWAYS_RAISED_TOGGLE #endif diff --git a/mozilla/toolkit/components/help/content/helpContextOverlay.xul b/mozilla/toolkit/components/help/content/helpContextOverlay.xul index c9034511e36..9f9af91e75a 100644 --- a/mozilla/toolkit/components/help/content/helpContextOverlay.xul +++ b/mozilla/toolkit/components/help/content/helpContextOverlay.xul @@ -75,9 +75,6 @@ label="&fullZoomReduceBtn.label;" accesskey="&fullZoomReduceBtn.accesskey;" oncommand="ZoomManager.reduce();"/> -#ifdef XP_MACOSX -#define HELP_ALWAYS_RAISED_TOGGLE -#endif #ifdef XP_WIN #define HELP_ALWAYS_RAISED_TOGGLE #endif