From f7573b9262d2b84ca56334238355293af76ba35b Mon Sep 17 00:00:00 2001 From: "scott%scott-macgregor.org" Date: Wed, 7 Sep 2005 01:07:06 +0000 Subject: [PATCH] Bug #307290 --> this synchs us up with how Firefox manages the release notes url by putting the app version into the url string. And it cleans up some duplicated loadThrobberUrl cruft that I've been meaning to get to. I also renamed the release notes url resource ID to make it easier for localizers. git-svn-id: svn://10.0.0.236/trunk@179760 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mail/app/profile/all-thunderbird.js | 6 ---- mozilla/mail/base/content/mailCore.js | 28 +++++++++++++++++++ .../mail/base/content/mailWindowOverlay.js | 10 ------- .../mail/base/content/mailWindowOverlay.xul | 12 ++++---- .../addrbook/content/addressbook.js | 10 ------- .../addrbook/content/addressbook.xul | 12 ++++---- .../compose/content/MsgComposeCommands.js | 12 -------- .../compose/content/messengercompose.xul | 12 ++++---- .../chrome/messenger-region/region.properties | 4 +-- 9 files changed, 47 insertions(+), 59 deletions(-) diff --git a/mozilla/mail/app/profile/all-thunderbird.js b/mozilla/mail/app/profile/all-thunderbird.js index 44181f1a700..b38982db16e 100644 --- a/mozilla/mail/app/profile/all-thunderbird.js +++ b/mozilla/mail/app/profile/all-thunderbird.js @@ -205,12 +205,6 @@ pref("mailnews.headers.minNumHeaders", 0); // 0 means we ignore this pref pref("mail.compose.dontWarnMail2Newsgroup", false); -pref("messenger.throbber.url","chrome://messenger-region/locale/region.properties"); -pref("mailnews.release_notes.url","chrome://messenger-region/locale/region.properties"); -pref("mailnews.hints_and_tips.url","chrome://messenger-region/locale/region.properties"); -pref("compose.throbber.url","chrome://messenger-region/locale/region.properties"); -pref("addressbook.throbber.url","chrome://messenger-region/locale/region.properties"); - pref("network.image.imageBehavior", 2); pref("network.cookie.cookieBehavior", 3); // 0-Accept, 1-dontAcceptForeign, 2-dontUse, 3-p3p diff --git a/mozilla/mail/base/content/mailCore.js b/mozilla/mail/base/content/mailCore.js index 2efa9f9b1cc..8af0bbf955d 100644 --- a/mozilla/mail/base/content/mailCore.js +++ b/mozilla/mail/base/content/mailCore.js @@ -265,3 +265,31 @@ function openAboutDialog() window.openDialog("chrome://messenger/content/aboutDialog.xul", "About", "modal,centerscreen,chrome,resizable=no"); #endif } + +/** + * Opens region specific web pages for the application like the release notes, the help site, etc. + * aResourceName --> the string resource ID in region.properties to load. + */ +function openRegionURL(aResourceName) +{ + var appInfo = Components.classes["@mozilla.org/xre/app-info;1"] + .getService(Components.interfaces.nsIXULAppInfo); + try { + var strBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].getService(Components.interfaces.nsIStringBundleService); + var regionBundle = strBundleService.createBundle("chrome://messenger-region/locale/region.properties"); + // the release notes are special and need to be formatted with the app version + var urlToOpen; + if (aResourceName == "releaseNotesURL") + urlToOpen = regionBundle.formatStringFromName(aResourceName, [appInfo.version], 1); + else + urlToOpen = regionBundle.GetStringFromName(aResourceName); + + var uri = Components.classes["@mozilla.org/network/io-service;1"] + .getService(Components.interfaces.nsIIOService) + .newURI(urlToOpen, null, null); + + var protocolSvc = Components.classes["@mozilla.org/uriloader/external-protocol-service;1"] + .getService(Components.interfaces.nsIExternalProtocolService); + protocolSvc.loadUrl(uri); + } catch (ex) {} +} diff --git a/mozilla/mail/base/content/mailWindowOverlay.js b/mozilla/mail/base/content/mailWindowOverlay.js index 03df1f6adef..563d8ac8e99 100644 --- a/mozilla/mail/base/content/mailWindowOverlay.js +++ b/mozilla/mail/base/content/mailWindowOverlay.js @@ -2511,16 +2511,6 @@ function OpenOrFocusWindow(args, windowType, chromeURL) window.openDialog(chromeURL, "", "chrome,resizable,status,centerscreen,dialog=no", args); } - -function loadThrobberUrl(urlPref) -{ - var url; - try { - url = gPrefBranch.getComplexValue(urlPref, Components.interfaces.nsIPrefLocalizedString).data; - messenger.launchExternalURL(url); - } catch (ex) {} -} - /** * Opens the update manager and checks for updates to the application. */ diff --git a/mozilla/mail/base/content/mailWindowOverlay.xul b/mozilla/mail/base/content/mailWindowOverlay.xul index c7af5959939..42e3f326b1a 100644 --- a/mozilla/mail/base/content/mailWindowOverlay.xul +++ b/mozilla/mail/base/content/mailWindowOverlay.xul @@ -415,7 +415,7 @@ #ifdef XP_MACOSX - + #endif @@ -1712,11 +1712,11 @@ #ifdef XP_MACOSX - - + + #else - - + + #endif - diff --git a/mozilla/mail/components/compose/content/MsgComposeCommands.js b/mozilla/mail/components/compose/content/MsgComposeCommands.js index 0769bd19e71..02de3966b13 100644 --- a/mozilla/mail/components/compose/content/MsgComposeCommands.js +++ b/mozilla/mail/components/compose/content/MsgComposeCommands.js @@ -3432,18 +3432,6 @@ function SwitchElementFocus(event) } } -// XXX hack, reuse the implementation in mailWindowOverlay.js by moving that method to an overlay that is included here too -function loadThrobberUrl(urlPref) -{ - var url; - try { - url = sPrefs.getComplexValue(urlPref, Components.interfaces.nsIPrefLocalizedString).data; - var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance(); - messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger); - messenger.launchExternalURL(url); - } catch (ex) {} -} - function toggleAddressPicker() { var sidebarBox = document.getElementById("sidebar-box"); diff --git a/mozilla/mail/components/compose/content/messengercompose.xul b/mozilla/mail/components/compose/content/messengercompose.xul index c11a33dff5c..5b7099d7543 100644 --- a/mozilla/mail/components/compose/content/messengercompose.xul +++ b/mozilla/mail/components/compose/content/messengercompose.xul @@ -231,7 +231,7 @@ #ifdef XP_MACOSX - + #endif @@ -551,11 +551,11 @@ #ifdef XP_MACOSX - - + + #else - - + + #endif - diff --git a/mozilla/mail/locales/en-US/chrome/messenger-region/region.properties b/mozilla/mail/locales/en-US/chrome/messenger-region/region.properties index 172461814b6..3da4700f4ff 100644 --- a/mozilla/mail/locales/en-US/chrome/messenger-region/region.properties +++ b/mozilla/mail/locales/en-US/chrome/messenger-region/region.properties @@ -2,11 +2,9 @@ # messenger.properties # mailnews.js mailnews.start_page.url=chrome://messenger/content/start.xhtml -mailnews.release_notes.url=http://www.mozilla.org/products/thunderbird/releases/ +releaseNotesURL=http://www.mozilla.org/products/thunderbird/releases/%S.html mailnews.hints_and_tips.url=http://www.mozilla.org/support/thunderbird/ messenger.throbber.url=http://www.mozilla.org/products/thunderbird/ -compose.throbber.url=http://www.mozilla.org/products/thunderbird/ -addressbook.throbber.url=http://www.mozilla.org/products/thunderbird/ # To make mapit buttons to disappear in the addressbook, specify empty string. For example: # mail.addr_book.mapit_url.format= # The format for "mail.addr_book.mapit_url.format" is: