|
@@ -3,7 +3,7 @@
|
|
|
# Date 1687859748 14400
|
|
|
# Tue Jun 27 05:55:48 2023 -0400
|
|
|
# Node ID cef48c3d22fb9a94394198886d4ff4076f4f238f
|
|
|
-# Parent 5791318005f4e18c18c1693c929c65d81f7d8c0b
|
|
|
+# Parent 344558f0709403856bb5c5f9b58652db1bcdb07c
|
|
|
Bug 1611647 - Port bug 1579952 - Fix references to xul files in suite.
|
|
|
|
|
|
diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
|
|
@@ -30,7 +30,7 @@ diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
|
|
|
pref("general.startup.mail", false);
|
|
|
pref("general.startup.news", false);
|
|
|
pref("general.startup.editor", false);
|
|
|
-@@ -743,18 +743,18 @@ pref("privacy.clearOnShutdown.siteSettin
|
|
|
+@@ -744,18 +744,18 @@ pref("privacy.clearOnShutdown.siteSettin
|
|
|
pref("privacy.warn_tracking_content", true);
|
|
|
|
|
|
// Switching this on will also spoof our user agent and other potentially
|
|
@@ -117,7 +117,7 @@ diff --git a/suite/base/content/nsContextMenu.js b/suite/base/content/nsContextM
|
|
|
var {BrowserUtils} =
|
|
|
ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
|
|
|
var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
|
-@@ -1136,17 +1136,17 @@ nsContextMenu.prototype = {
|
|
|
+@@ -1135,17 +1135,17 @@ nsContextMenu.prototype = {
|
|
|
{ referrerURI: doc.documentURIObject,
|
|
|
triggeringPrincipal: this.target.nodePrincipal,
|
|
|
});
|
|
@@ -136,7 +136,7 @@ diff --git a/suite/base/content/nsContextMenu.js b/suite/base/content/nsContextM
|
|
|
saveFrame: function() {
|
|
|
saveDocument(this.target.ownerDocument, true);
|
|
|
},
|
|
|
-@@ -1363,17 +1363,17 @@ nsContextMenu.prototype = {
|
|
|
+@@ -1362,17 +1362,17 @@ nsContextMenu.prototype = {
|
|
|
}
|
|
|
else
|
|
|
PlacesUIUtils.showItemProperties(itemId,
|
|
@@ -158,7 +158,7 @@ diff --git a/suite/base/content/nsContextMenu.js b/suite/base/content/nsContextM
|
|
|
diff --git a/suite/base/content/tasksOverlay.js b/suite/base/content/tasksOverlay.js
|
|
|
--- a/suite/base/content/tasksOverlay.js
|
|
|
+++ b/suite/base/content/tasksOverlay.js
|
|
|
-@@ -32,17 +32,17 @@ function toDownloadManager()
|
|
|
+@@ -30,17 +30,17 @@ function toDownloadManager()
|
|
|
.showDownloadManager();
|
|
|
}
|
|
|
|
|
@@ -177,7 +177,7 @@ diff --git a/suite/base/content/tasksOverlay.js b/suite/base/content/tasksOverla
|
|
|
|
|
|
switchToTabHavingURI("about:data", true, function(browser) {
|
|
|
if (aView)
|
|
|
-@@ -51,38 +51,38 @@ function toDataManager(aView)
|
|
|
+@@ -49,38 +49,38 @@ function toDataManager(aView)
|
|
|
}
|
|
|
|
|
|
function toEM(aView)
|
|
@@ -219,7 +219,7 @@ diff --git a/suite/base/content/tasksOverlay.js b/suite/base/content/tasksOverla
|
|
|
// Try to focus the previously focused window e.g. message compose body
|
|
|
aWindow.document.commandDispatcher.focusedWindow.focus();
|
|
|
} catch (e) {
|
|
|
-@@ -252,17 +252,17 @@ function toProfileManager()
|
|
|
+@@ -250,17 +250,17 @@ function toProfileManager()
|
|
|
if (promgrWin) {
|
|
|
promgrWin.focus();
|
|
|
} else {
|
|
@@ -241,7 +241,7 @@ diff --git a/suite/base/content/tasksOverlay.js b/suite/base/content/tasksOverla
|
|
|
diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOverlay.js
|
|
|
--- a/suite/base/content/utilityOverlay.js
|
|
|
+++ b/suite/base/content/utilityOverlay.js
|
|
|
-@@ -22,17 +22,17 @@ XPCOMUtils.defineLazyModuleGetters(this,
|
|
|
+@@ -21,17 +21,17 @@ XPCOMUtils.defineLazyModuleGetters(this,
|
|
|
// XPCOMUtils.defineLazyGetter(this, "Weave", function() {
|
|
|
// let tmp = {};
|
|
|
// ChromeUtils.import("resource://services-sync/main.js", tmp);
|
|
@@ -260,7 +260,7 @@ diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOv
|
|
|
|
|
|
const kProxyManual = ["network.proxy.ftp",
|
|
|
"network.proxy.http",
|
|
|
-@@ -220,27 +220,27 @@ function setOfflineUI(offline)
|
|
|
+@@ -219,27 +219,27 @@ function setOfflineUI(offline)
|
|
|
function getBrowserURL() {
|
|
|
|
|
|
try {
|
|
@@ -290,7 +290,7 @@ diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOv
|
|
|
{
|
|
|
var toolbar = document.getElementById(id);
|
|
|
if (!toolbar)
|
|
|
-@@ -279,17 +279,17 @@ function SuiteCustomizeToolbar(aMenuItem
|
|
|
+@@ -278,17 +278,17 @@ function SuiteCustomizeToolbar(aMenuItem
|
|
|
function goCustomizeToolbar(toolbox)
|
|
|
{
|
|
|
/* If the toolbox has a method "customizeInit" then call it first.
|
|
@@ -309,7 +309,7 @@ diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOv
|
|
|
var sheetFrame = document.getElementById("customizeToolbarSheetIFrame");
|
|
|
var panel = document.getElementById("customizeToolbarSheetPopup");
|
|
|
sheetFrame.hidden = false;
|
|
|
-@@ -1090,17 +1090,17 @@ function BrowserOnCommand(event)
|
|
|
+@@ -1089,17 +1089,17 @@ function BrowserOnCommand(event)
|
|
|
switch (Services.prefs.getIntPref("browser.ssl_override_behavior", 2)) {
|
|
|
case 2 : // Pre-fetch & pre-populate.
|
|
|
params.prefetchCert = true;
|
|
@@ -328,7 +328,7 @@ diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOv
|
|
|
}
|
|
|
else if (buttonID == "getMeOutOfHereButton") {
|
|
|
// Redirect them to a known-functioning page, default start page
|
|
|
-@@ -1810,17 +1810,17 @@ function subscribeToFeedMiddleClick(href
|
|
|
+@@ -1809,17 +1809,17 @@ function subscribeToFeedMiddleClick(href
|
|
|
}
|
|
|
|
|
|
function OpenSearchEngineManager() {
|
|
@@ -759,7 +759,7 @@ diff --git a/suite/browser/mailNavigatorOverlay.js b/suite/browser/mailNavigator
|
|
|
diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
|
|
|
--- a/suite/browser/navigator.js
|
|
|
+++ b/suite/browser/navigator.js
|
|
|
-@@ -1673,17 +1673,17 @@ function QualifySearchTerm()
|
|
|
+@@ -1672,17 +1672,17 @@ function QualifySearchTerm()
|
|
|
return gURLBar.value;
|
|
|
return "";
|
|
|
}
|
|
@@ -778,7 +778,7 @@ diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
|
|
|
loadURI(data.url, null, data.postData, true);
|
|
|
break;
|
|
|
case "1": // new window
|
|
|
-@@ -2416,17 +2416,17 @@ function BrowserPageInfo(documentURL, in
|
|
|
+@@ -2415,17 +2415,17 @@ function BrowserPageInfo(documentURL, in
|
|
|
if (win.document.documentElement
|
|
|
.getAttribute("relatedUrl") == documentURL) {
|
|
|
win.focus();
|
|
@@ -797,7 +797,7 @@ diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
|
|
|
function hiddenWindowStartup()
|
|
|
{
|
|
|
// focus the hidden window
|
|
|
-@@ -2951,17 +2951,17 @@ function BrowserUploadFile()
|
|
|
+@@ -2950,17 +2950,17 @@ function BrowserUploadFile()
|
|
|
// this gives the protocol handler the best chance of generating a
|
|
|
// properly formatted URI spec. we pass null for the origin charset
|
|
|
// parameter since we want the URI to inherit the origin charset
|
|
@@ -816,7 +816,7 @@ diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
|
|
|
/* This function is called whenever the file menu is about to be displayed.
|
|
|
* Enable the upload menu item if appropriate. */
|
|
|
function updateFileUploadItem()
|
|
|
-@@ -3249,17 +3249,17 @@ function viewCertificate()
|
|
|
+@@ -3248,17 +3248,17 @@ function viewCertificate()
|
|
|
Cc["@mozilla.org/nsCertificateDialogs;1"]
|
|
|
.getService(Ci.nsICertificateDialogs)
|
|
|
.viewCert(window, cert);
|
|
@@ -867,7 +867,7 @@ diff --git a/suite/browser/navigator.xhtml b/suite/browser/navigator.xhtml
|
|
|
%navigatorDTD;
|
|
|
]>
|
|
|
|
|
|
-@@ -507,17 +507,17 @@
|
|
|
+@@ -532,17 +532,17 @@
|
|
|
placespopup="true"
|
|
|
tooltip="bhTooltip" popupsinherittooltip="true"
|
|
|
context="placesContext"/>
|
|
@@ -977,7 +977,7 @@ diff --git a/suite/browser/navigatorOverlay.xhtml b/suite/browser/navigatorOverl
|
|
|
diff --git a/suite/browser/nsBrowserContentHandler.js b/suite/browser/nsBrowserContentHandler.js
|
|
|
--- a/suite/browser/nsBrowserContentHandler.js
|
|
|
+++ b/suite/browser/nsBrowserContentHandler.js
|
|
|
-@@ -158,27 +158,27 @@ function openWindow(parent, url, feature
|
|
|
+@@ -156,27 +156,27 @@ function openWindow(parent, url, feature
|
|
|
}
|
|
|
|
|
|
function openPreferences()
|
|
@@ -1007,7 +1007,7 @@ diff --git a/suite/browser/nsBrowserContentHandler.js b/suite/browser/nsBrowserC
|
|
|
return;
|
|
|
|
|
|
var navWin = Services.wm.getMostRecentWindow("navigator:browser");
|
|
|
-@@ -263,31 +263,31 @@ var nsBrowserContentHandler = {
|
|
|
+@@ -261,31 +261,31 @@ var nsBrowserContentHandler = {
|
|
|
else if (RegExp.$3 == "new-tab")
|
|
|
location = nsIBrowserDOMWindow.OPEN_NEWTAB;
|
|
|
|
|
@@ -1496,7 +1496,7 @@ diff --git a/suite/components/bindings/notification.xml b/suite/components/bindi
|
|
|
diff --git a/suite/components/bindings/prefwindow.xml b/suite/components/bindings/prefwindow.xml
|
|
|
--- a/suite/components/bindings/prefwindow.xml
|
|
|
+++ b/suite/components/bindings/prefwindow.xml
|
|
|
-@@ -436,17 +436,17 @@
|
|
|
+@@ -434,17 +434,17 @@
|
|
|
{
|
|
|
// Open topic in new window.
|
|
|
const params = Cc["@mozilla.org/embedcomp/dialogparam;1"]
|
|
@@ -1556,7 +1556,7 @@ diff --git a/suite/components/console/jar.mn b/suite/components/console/jar.mn
|
|
|
diff --git a/suite/components/console/jsconsole-clhandler.js b/suite/components/console/jsconsole-clhandler.js
|
|
|
--- a/suite/components/console/jsconsole-clhandler.js
|
|
|
+++ b/suite/components/console/jsconsole-clhandler.js
|
|
|
-@@ -10,17 +10,17 @@ function jsConsoleHandler() {}
|
|
|
+@@ -9,17 +9,17 @@ function jsConsoleHandler() {}
|
|
|
jsConsoleHandler.prototype = {
|
|
|
handle: function clh_handle(cmdLine) {
|
|
|
if (!cmdLine.handleFlag("suiteconsole", false))
|
|
@@ -1614,7 +1614,7 @@ diff --git a/suite/components/dataman/jar.mn b/suite/components/dataman/jar.mn
|
|
|
diff --git a/suite/components/downloads/DownloadsCommon.jsm b/suite/components/downloads/DownloadsCommon.jsm
|
|
|
--- a/suite/components/downloads/DownloadsCommon.jsm
|
|
|
+++ b/suite/components/downloads/DownloadsCommon.jsm
|
|
|
-@@ -65,17 +65,17 @@ const kDownloadsStringsRequiringPluralFo
|
|
|
+@@ -64,17 +64,17 @@ const kDownloadsStringsRequiringPluralFo
|
|
|
otherDownloads3: true
|
|
|
};
|
|
|
|
|
@@ -1633,7 +1633,7 @@ diff --git a/suite/components/downloads/DownloadsCommon.jsm b/suite/components/d
|
|
|
try {
|
|
|
switch (typeof this.prefs[name]) {
|
|
|
case "boolean":
|
|
|
-@@ -535,17 +535,17 @@ var DownloadsCommon = {
|
|
|
+@@ -534,17 +534,17 @@ var DownloadsCommon = {
|
|
|
message += "\n\n" + s.unblockTip2;
|
|
|
|
|
|
Services.ww.registerNotification(function onOpen(subj, topic) {
|
|
@@ -1655,7 +1655,7 @@ diff --git a/suite/components/downloads/DownloadsCommon.jsm b/suite/components/d
|
|
|
diff --git a/suite/components/downloads/content/downloadmanager.js b/suite/components/downloads/content/downloadmanager.js
|
|
|
--- a/suite/components/downloads/content/downloadmanager.js
|
|
|
+++ b/suite/components/downloads/content/downloadmanager.js
|
|
|
-@@ -170,17 +170,17 @@ function showDownload(aDownload)
|
|
|
+@@ -169,17 +169,17 @@ function showDownload(aDownload)
|
|
|
} else {
|
|
|
file = new FileUtils.File(aDownload.target.partFilePath);
|
|
|
}
|
|
@@ -1810,7 +1810,7 @@ diff --git a/suite/components/downloads/tests/chrome/test_drag.xhtml b/suite/com
|
|
|
diff --git a/suite/components/helpviewer/content/contextHelp.js b/suite/components/helpviewer/content/contextHelp.js
|
|
|
--- a/suite/components/helpviewer/content/contextHelp.js
|
|
|
+++ b/suite/components/helpviewer/content/contextHelp.js
|
|
|
-@@ -34,17 +34,17 @@ function openHelp(topic, contentPack)
|
|
|
+@@ -33,17 +33,17 @@ function openHelp(topic, contentPack)
|
|
|
params.SetString(0, helpFileURI);
|
|
|
params.SetString(1, topic);
|
|
|
|
|
@@ -1870,7 +1870,7 @@ diff --git a/suite/components/helpviewer/jar.mn b/suite/components/helpviewer/ja
|
|
|
diff --git a/suite/components/migration/SuiteProfileMigrator.js b/suite/components/migration/SuiteProfileMigrator.js
|
|
|
--- a/suite/components/migration/SuiteProfileMigrator.js
|
|
|
+++ b/suite/components/migration/SuiteProfileMigrator.js
|
|
|
-@@ -28,17 +28,17 @@ ProfileMigrator.prototype = {
|
|
|
+@@ -27,17 +27,17 @@ ProfileMigrator.prototype = {
|
|
|
|
|
|
let params = Cc["@mozilla.org/array;1"]
|
|
|
.createInstance(Ci.nsIMutableArray);
|
|
@@ -1904,7 +1904,7 @@ diff --git a/suite/components/migration/jar.mn b/suite/components/migration/jar.
|
|
|
diff --git a/suite/components/nsAbout.js b/suite/components/nsAbout.js
|
|
|
--- a/suite/components/nsAbout.js
|
|
|
+++ b/suite/components/nsAbout.js
|
|
|
-@@ -14,31 +14,31 @@ function About() { }
|
|
|
+@@ -13,31 +13,31 @@ function About() { }
|
|
|
About.prototype = {
|
|
|
Flags: SCRIPT,
|
|
|
URI: "chrome://communicator/content/about.xhtml",
|
|
@@ -1942,7 +1942,7 @@ diff --git a/suite/components/nsAbout.js b/suite/components/nsAbout.js
|
|
|
diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
|
|
|
--- a/suite/components/nsSuiteGlue.js
|
|
|
+++ b/suite/components/nsSuiteGlue.js
|
|
|
-@@ -83,17 +83,17 @@ const BOOKMARKS_BACKUP_IDLE_TIME_SEC = 1
|
|
|
+@@ -82,17 +82,17 @@ const BOOKMARKS_BACKUP_IDLE_TIME_SEC = 1
|
|
|
// per interval.
|
|
|
const BOOKMARKS_BACKUP_MIN_INTERVAL_DAYS = 1;
|
|
|
|
|
@@ -1961,7 +1961,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
|
|
|
// Constructor
|
|
|
function SuiteGlue() {
|
|
|
XPCOMUtils.defineLazyServiceGetter(this, "_idleService",
|
|
|
-@@ -194,17 +194,17 @@ SuiteGlue.prototype = {
|
|
|
+@@ -193,17 +193,17 @@ SuiteGlue.prototype = {
|
|
|
// the UI has gone should be finalized in _onQuitApplicationGranted.
|
|
|
this._dispose();
|
|
|
break;
|
|
@@ -1980,7 +1980,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
|
|
|
break;
|
|
|
case "final-ui-startup":
|
|
|
this._onProfileStartup();
|
|
|
-@@ -381,17 +381,17 @@ SuiteGlue.prototype = {
|
|
|
+@@ -380,17 +380,17 @@ SuiteGlue.prototype = {
|
|
|
}
|
|
|
},
|
|
|
|
|
@@ -1999,7 +1999,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
|
|
|
// profile startup handler (contains profile initialization routines)
|
|
|
_onProfileStartup: function()
|
|
|
{
|
|
|
-@@ -827,17 +827,17 @@ SuiteGlue.prototype = {
|
|
|
+@@ -826,17 +826,17 @@ SuiteGlue.prototype = {
|
|
|
.createInstance(Ci.nsIMutableArray);
|
|
|
let str = Cc["@mozilla.org/supports-string;1"]
|
|
|
.createInstance(Ci.nsISupportsString);
|
|
@@ -2018,7 +2018,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
|
|
|
|
|
|
Services.prefs.clearUserPref(PREF_EM_NEW_ADDONS_LIST);
|
|
|
},
|
|
|
-@@ -1031,17 +1031,17 @@ SuiteGlue.prototype = {
|
|
|
+@@ -1030,17 +1030,17 @@ SuiteGlue.prototype = {
|
|
|
if (ShellService) try {
|
|
|
var appTypes = ShellService.shouldBeDefaultClientFor;
|
|
|
|
|
@@ -2056,7 +2056,7 @@ diff --git a/suite/components/permissions/jar.mn b/suite/components/permissions/
|
|
|
diff --git a/suite/components/places/PlacesUIUtils.jsm b/suite/components/places/PlacesUIUtils.jsm
|
|
|
--- a/suite/components/places/PlacesUIUtils.jsm
|
|
|
+++ b/suite/components/places/PlacesUIUtils.jsm
|
|
|
-@@ -270,18 +270,18 @@ var PlacesUIUtils = {
|
|
|
+@@ -269,18 +269,18 @@ var PlacesUIUtils = {
|
|
|
showBookmarkDialog(aInfo, aParentWindow) {
|
|
|
// Preserve size attributes differently based on the fact the dialog has
|
|
|
// a folder picker or not, since it needs more horizontal space than the
|
|
@@ -2077,7 +2077,7 @@ diff --git a/suite/components/places/PlacesUIUtils.jsm b/suite/components/places
|
|
|
|
|
|
// Set the transaction manager into batching mode.
|
|
|
topUndoEntry = PlacesTransactions.topUndoEntry;
|
|
|
-@@ -640,17 +640,17 @@ var PlacesUIUtils = {
|
|
|
+@@ -639,17 +639,17 @@ var PlacesUIUtils = {
|
|
|
browserWindow.whereToOpenLink(aEvent, false, true) : "window";
|
|
|
if (where == "window") {
|
|
|
// There is no browser window open, thus open a new one.
|
|
@@ -2990,7 +2990,7 @@ diff --git a/suite/components/pref/tests/browser/browser_bug410900.js b/suite/co
|
|
|
diff --git a/suite/components/profile/content/profileSelection.js b/suite/components/profile/content/profileSelection.js
|
|
|
--- a/suite/components/profile/content/profileSelection.js
|
|
|
+++ b/suite/components/profile/content/profileSelection.js
|
|
|
-@@ -145,17 +145,17 @@ function AcceptDialog()
|
|
|
+@@ -143,17 +143,17 @@ function AcceptDialog()
|
|
|
env.set("XRE_PROFILE_LOCAL_PATH", "");
|
|
|
return false;
|
|
|
}
|
|
@@ -3026,7 +3026,7 @@ diff --git a/suite/components/profile/jar.mn b/suite/components/profile/jar.mn
|
|
|
diff --git a/suite/components/sanitize/Sanitizer.jsm b/suite/components/sanitize/Sanitizer.jsm
|
|
|
--- a/suite/components/sanitize/Sanitizer.jsm
|
|
|
+++ b/suite/components/sanitize/Sanitizer.jsm
|
|
|
-@@ -87,17 +87,17 @@ var Sanitizer = {
|
|
|
+@@ -86,17 +86,17 @@ var Sanitizer = {
|
|
|
* @param [optional] parentWindow the window to use as
|
|
|
* parent for the created dialog.
|
|
|
*/
|
|
@@ -3186,7 +3186,7 @@ diff --git a/suite/components/shell/jar.mn b/suite/components/shell/jar.mn
|
|
|
diff --git a/suite/components/sidebar/content/customize.js b/suite/components/sidebar/content/customize.js
|
|
|
--- a/suite/components/sidebar/content/customize.js
|
|
|
+++ b/suite/components/sidebar/content/customize.js
|
|
|
-@@ -289,17 +289,17 @@ function PreviewPanel()
|
|
|
+@@ -287,17 +287,17 @@ function PreviewPanel()
|
|
|
for (var index = min.value; index <= max.value; ++index) {
|
|
|
var item = tree.contentView.getItemAtIndex(index);
|
|
|
var res = RDF.GetResource(item.id);
|
|
@@ -3205,7 +3205,7 @@ diff --git a/suite/components/sidebar/content/customize.js b/suite/components/si
|
|
|
|
|
|
// Add the selected panel(s).
|
|
|
function AddPanel()
|
|
|
-@@ -409,30 +409,30 @@ function CustomizePanel()
|
|
|
+@@ -407,30 +407,30 @@ function CustomizePanel()
|
|
|
var selectedNode = tree.contentView.getItemAtIndex(index);
|
|
|
var panel_id = selectedNode.getAttribute('id');
|
|
|
var customize_url = selectedNode.getAttribute('customize');
|
|
@@ -3241,7 +3241,7 @@ diff --git a/suite/components/sidebar/content/customize.js b/suite/components/si
|
|
|
diff --git a/suite/components/sidebar/content/sidebarOverlay.js b/suite/components/sidebar/content/sidebarOverlay.js
|
|
|
--- a/suite/components/sidebar/content/sidebarOverlay.js
|
|
|
+++ b/suite/components/sidebar/content/sidebarOverlay.js
|
|
|
-@@ -34,17 +34,17 @@ var gCurFrame;
|
|
|
+@@ -32,17 +32,17 @@ var gCurFrame;
|
|
|
var gTimeoutID = null;
|
|
|
var gMustInit = true;
|
|
|
var gAboutToUncollapse = false;
|
|
@@ -3260,7 +3260,7 @@ diff --git a/suite/components/sidebar/content/sidebarOverlay.js b/suite/componen
|
|
|
|
|
|
// pref for limiting number of tabs in view
|
|
|
// initialized in sidebar_overlay_init()
|
|
|
-@@ -1058,31 +1058,31 @@ function SidebarCustomize() {
|
|
|
+@@ -1056,31 +1056,31 @@ function SidebarCustomize() {
|
|
|
|
|
|
if (false == gDisableCustomize) {
|
|
|
debug("First time creating customize dialog");
|
|
@@ -4208,7 +4208,7 @@ diff --git a/suite/locales/en-US/chrome/mailnews/pref/pref-offline.dtd b/suite/l
|
|
|
diff --git a/suite/mailnews/components/addrbook/content/abCommon.js b/suite/mailnews/components/addrbook/content/abCommon.js
|
|
|
--- a/suite/mailnews/components/addrbook/content/abCommon.js
|
|
|
+++ b/suite/mailnews/components/addrbook/content/abCommon.js
|
|
|
-@@ -175,25 +175,25 @@ function SendCommandToResultsPane(comman
|
|
|
+@@ -174,25 +174,25 @@ function SendCommandToResultsPane(comman
|
|
|
|
|
|
// if we are sending the command so the results pane
|
|
|
// we should focus the results pane
|
|
@@ -4236,7 +4236,7 @@ diff --git a/suite/mailnews/components/addrbook/content/abCommon.js b/suite/mail
|
|
|
function AbEditSelectedDirectory()
|
|
|
{
|
|
|
let selectedDir = getSelectedDirectory();
|
|
|
-@@ -633,51 +633,51 @@ function ChangeDirectoryByURI(uri = kPer
|
|
|
+@@ -632,51 +632,51 @@ function ChangeDirectoryByURI(uri = kPer
|
|
|
|
|
|
function AbNewList()
|
|
|
{
|
|
@@ -4424,7 +4424,7 @@ diff --git a/suite/mailnews/components/addrbook/content/abSelectAddressesDialog.
|
|
|
diff --git a/suite/mailnews/components/addrbook/content/addressbook.js b/suite/mailnews/components/addrbook/content/addressbook.js
|
|
|
--- a/suite/mailnews/components/addrbook/content/addressbook.js
|
|
|
+++ b/suite/mailnews/components/addrbook/content/addressbook.js
|
|
|
-@@ -212,17 +212,17 @@ function AbPrintCardInternal(doPrintPrev
|
|
|
+@@ -211,17 +211,17 @@ function AbPrintCardInternal(doPrintPrev
|
|
|
for (let i = 0; i < numSelected; i++) {
|
|
|
let card = selectedItems[i];
|
|
|
let printCardUrl = CreatePrintCardUrl(card);
|
|
@@ -4443,7 +4443,7 @@ diff --git a/suite/mailnews/components/addrbook/content/addressbook.js b/suite/m
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
-@@ -254,17 +254,17 @@ function AbPrintAddressBookInternal(doPr
|
|
|
+@@ -253,17 +253,17 @@ function AbPrintAddressBookInternal(doPr
|
|
|
/*
|
|
|
turn "moz-abmdbdirectory://abook.mab" into
|
|
|
"addbook://moz-abmdbdirectory/abook.mab?action=print"
|
|
@@ -4462,7 +4462,7 @@ diff --git a/suite/mailnews/components/addrbook/content/addressbook.js b/suite/m
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
-@@ -383,17 +383,17 @@ function onAdvancedAbSearch()
|
|
|
+@@ -382,17 +382,17 @@ function onAdvancedAbSearch()
|
|
|
let selectedDirURI = getSelectedDirectoryURI();
|
|
|
if (!selectedDirURI)
|
|
|
return;
|
|
@@ -4573,7 +4573,7 @@ diff --git a/suite/mailnews/components/addrbook/jar.mn b/suite/mailnews/componen
|
|
|
diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/suite/mailnews/components/compose/content/MsgComposeCommands.js
|
|
|
--- a/suite/mailnews/components/compose/content/MsgComposeCommands.js
|
|
|
+++ b/suite/mailnews/components/compose/content/MsgComposeCommands.js
|
|
|
-@@ -1764,17 +1764,17 @@ function GenericSendMessage(msgType) {
|
|
|
+@@ -1763,17 +1763,17 @@ function GenericSendMessage(msgType) {
|
|
|
msgType == Ci.nsIMsgCompDeliverMode.Background) {
|
|
|
//Do we need to check the spelling?
|
|
|
if (DoSpellCheckBeforeSend()) {
|
|
@@ -4592,7 +4592,7 @@ diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/s
|
|
|
|
|
|
// Strip trailing spaces and long consecutive WSP sequences from the
|
|
|
// subject line to prevent getting only WSP chars on a folded line.
|
|
|
-@@ -1847,17 +1847,17 @@ function GenericSendMessage(msgType) {
|
|
|
+@@ -1846,17 +1846,17 @@ function GenericSendMessage(msgType) {
|
|
|
if (!CheckValidEmailAddress(msgCompFields.to, msgCompFields.cc, msgCompFields.bcc))
|
|
|
return;
|
|
|
|
|
@@ -4611,7 +4611,7 @@ diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/s
|
|
|
}
|
|
|
|
|
|
// We will remember the users "send format" decision in the address
|
|
|
-@@ -2196,17 +2196,17 @@ function SelectAddress()
|
|
|
+@@ -2195,17 +2195,17 @@ function SelectAddress()
|
|
|
|
|
|
Recipients2CompFields(msgCompFields);
|
|
|
|
|
@@ -4630,7 +4630,7 @@ diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/s
|
|
|
ccAddress:ccAddress,
|
|
|
bccAddress:bccAddress});
|
|
|
// We have to set focus to the addressingwidget because we seem to loose focus often
|
|
|
-@@ -2763,17 +2763,17 @@ function MessageGetNumSelectedAttachment
|
|
|
+@@ -2762,17 +2762,17 @@ function MessageGetNumSelectedAttachment
|
|
|
{
|
|
|
var bucketList = GetMsgAttachmentElement();
|
|
|
return (bucketList) ? bucketList.selectedItems.length : 0;
|
|
@@ -4871,7 +4871,7 @@ diff --git a/suite/mailnews/components/prefs/jar.mn b/suite/mailnews/components/
|
|
|
diff --git a/suite/mailnews/components/smime/content/msgCompSMIMEOverlay.js b/suite/mailnews/components/smime/content/msgCompSMIMEOverlay.js
|
|
|
--- a/suite/mailnews/components/smime/content/msgCompSMIMEOverlay.js
|
|
|
+++ b/suite/mailnews/components/smime/content/msgCompSMIMEOverlay.js
|
|
|
-@@ -209,17 +209,17 @@ function setEncryptionUI()
|
|
|
+@@ -207,17 +207,17 @@ function setEncryptionUI()
|
|
|
top.document.getElementById("encryption-status").collapsed = false;
|
|
|
}
|
|
|
|
|
@@ -4890,7 +4890,7 @@ diff --git a/suite/mailnews/components/smime/content/msgCompSMIMEOverlay.js b/su
|
|
|
smFields : gSMFields,
|
|
|
isSigningCertAvailable :
|
|
|
gCurrentIdentity.getUnicharAttribute("signing_cert_name") != "",
|
|
|
-@@ -291,17 +291,17 @@ function onComposerSendMessage()
|
|
|
+@@ -289,17 +289,17 @@ function onComposerSendMessage()
|
|
|
{
|
|
|
// Try the global one
|
|
|
if (Services.prefs.getBoolPref("ldap_2.autoComplete.useDirectory"))
|
|
@@ -4936,7 +4936,7 @@ diff --git a/suite/mailnews/content/ABSearchDialog.xhtml b/suite/mailnews/conten
|
|
|
diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content/FilterListDialog.js
|
|
|
--- a/suite/mailnews/content/FilterListDialog.js
|
|
|
+++ b/suite/mailnews/content/FilterListDialog.js
|
|
|
-@@ -336,17 +336,17 @@ function onEditFilter()
|
|
|
+@@ -335,17 +335,17 @@ function onEditFilter()
|
|
|
return;
|
|
|
|
|
|
var selectedFilter = currentFilter();
|
|
@@ -4955,7 +4955,7 @@ diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-@@ -396,17 +396,17 @@ function calculatePositionAndShowCreateF
|
|
|
+@@ -395,17 +395,17 @@ function calculatePositionAndShowCreateF
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -4974,7 +4974,7 @@ diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content
|
|
|
// On success: reset the search box if necessary!
|
|
|
resetSearchBox(args.newFilter);
|
|
|
rebuildFilterList();
|
|
|
-@@ -559,17 +559,17 @@ function moveFilter(motion) {
|
|
|
+@@ -558,17 +558,17 @@ function moveFilter(motion) {
|
|
|
|
|
|
rebuildFilterList();
|
|
|
}
|
|
@@ -5068,7 +5068,7 @@ diff --git a/suite/mailnews/content/SearchDialog.xhtml b/suite/mailnews/content/
|
|
|
diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folderPane.js
|
|
|
--- a/suite/mailnews/content/folderPane.js
|
|
|
+++ b/suite/mailnews/content/folderPane.js
|
|
|
-@@ -1736,17 +1736,17 @@ var gFolderTreeController = {
|
|
|
+@@ -1734,17 +1734,17 @@ var gFolderTreeController = {
|
|
|
// createSubfolder can throw an exception, causing the newFolder dialog
|
|
|
// to not close and wait for another input.
|
|
|
// TODO: Rewrite this logic and move the opening of alert dialogs from
|
|
@@ -5087,7 +5087,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
-@@ -1811,17 +1811,17 @@ var gFolderTreeController = {
|
|
|
+@@ -1809,17 +1809,17 @@ var gFolderTreeController = {
|
|
|
// context menu on a non-loaded folder).
|
|
|
if (msgFolder == GetLoadedMsgFolder()) {
|
|
|
gRerootOnFolderLoad = true;
|
|
@@ -5106,7 +5106,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
|
|
|
rebuildSummaryCallback: rebuildSummary});
|
|
|
},
|
|
|
|
|
|
-@@ -1842,17 +1842,17 @@ var gFolderTreeController = {
|
|
|
+@@ -1840,17 +1840,17 @@ var gFolderTreeController = {
|
|
|
|
|
|
controller._resetThreadPane();
|
|
|
let folderTree = document.getElementById("folderTree");
|
|
@@ -5125,7 +5125,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
|
|
|
/**
|
|
|
* Deletes a folder from its parent. Also handles unsubscribe from newsgroups
|
|
|
* if the selected folder/s happen to be nntp.
|
|
|
-@@ -1999,17 +1999,17 @@ var gFolderTreeController = {
|
|
|
+@@ -1997,17 +1997,17 @@ var gFolderTreeController = {
|
|
|
let folder = aParent || GetSelectedMsgFolders()[0];
|
|
|
if (!folder)
|
|
|
folder = GetDefaultAccountRootFolder();
|
|
@@ -5144,7 +5144,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
|
|
|
/**
|
|
|
* Opens the dialog to edit the properties for a virtual folder
|
|
|
*
|
|
|
-@@ -2021,17 +2021,17 @@ var gFolderTreeController = {
|
|
|
+@@ -2019,17 +2019,17 @@ var gFolderTreeController = {
|
|
|
function editVirtualCallback(aURI) {
|
|
|
// we need to reload the folder if it is the currently loaded folder...
|
|
|
if (gMsgFolderSelected && aURI == gMsgFolderSelected.URI) {
|
|
@@ -5188,7 +5188,7 @@ diff --git a/suite/mailnews/content/mail-offline.js b/suite/mailnews/content/mai
|
|
|
diff --git a/suite/mailnews/content/mailCommands.js b/suite/mailnews/content/mailCommands.js
|
|
|
--- a/suite/mailnews/content/mailCommands.js
|
|
|
+++ b/suite/mailnews/content/mailCommands.js
|
|
|
-@@ -244,17 +244,17 @@ function NewMessageToSelectedAddresses(t
|
|
|
+@@ -243,17 +243,17 @@ function NewMessageToSelectedAddresses(t
|
|
|
params.composeFields = composeFields;
|
|
|
msgComposeService.OpenComposeWindowWithParams(null, params);
|
|
|
}
|
|
@@ -5207,7 +5207,7 @@ diff --git a/suite/mailnews/content/mailCommands.js b/suite/mailnews/content/mai
|
|
|
function SubscribeOKCallback(changeTable)
|
|
|
{
|
|
|
for (var serverURI in changeTable) {
|
|
|
-@@ -392,17 +392,17 @@ function ViewPageSource(messages)
|
|
|
+@@ -391,17 +391,17 @@ function ViewPageSource(messages)
|
|
|
// Now, we need to get a URL from a URI.
|
|
|
var url = MailServices.mailSession.ConvertMsgURIToMsgURL(messages[i],
|
|
|
msgWindow);
|
|
@@ -5229,7 +5229,7 @@ diff --git a/suite/mailnews/content/mailCommands.js b/suite/mailnews/content/mai
|
|
|
diff --git a/suite/mailnews/content/mailContextMenus.js b/suite/mailnews/content/mailContextMenus.js
|
|
|
--- a/suite/mailnews/content/mailContextMenus.js
|
|
|
+++ b/suite/mailnews/content/mailContextMenus.js
|
|
|
-@@ -531,26 +531,26 @@ function AddContact(aEmailAddressNode)
|
|
|
+@@ -530,26 +530,26 @@ function AddContact(aEmailAddressNode)
|
|
|
{
|
|
|
if (aEmailAddressNode)
|
|
|
AddEmailToAddressBook(aEmailAddressNode.getAttribute("emailAddress"),
|
|
@@ -5258,7 +5258,7 @@ diff --git a/suite/mailnews/content/mailContextMenus.js b/suite/mailnews/content
|
|
|
|
|
|
/**
|
|
|
* SendMailToNode takes the email address title button, extracts the email address
|
|
|
-@@ -693,17 +693,17 @@ function OpenMessageByHeader(messageHead
|
|
|
+@@ -692,17 +692,17 @@ function OpenMessageByHeader(messageHead
|
|
|
{
|
|
|
var folder = messageHeader.folder;
|
|
|
var folderURI = folder.URI;
|
|
@@ -5522,7 +5522,7 @@ diff --git a/suite/mailnews/content/mailWidgets.xml b/suite/mailnews/content/mai
|
|
|
diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/content/mailWindowOverlay.js
|
|
|
--- a/suite/mailnews/content/mailWindowOverlay.js
|
|
|
+++ b/suite/mailnews/content/mailWindowOverlay.js
|
|
|
-@@ -1350,17 +1350,17 @@ function MsgOpenFromFile() {
|
|
|
+@@ -1349,17 +1349,17 @@ function MsgOpenFromFile() {
|
|
|
|
|
|
fp.open(rv => {
|
|
|
if (rv != Ci.nsIFilePicker.returnOK || !fp.file) {
|
|
@@ -5541,7 +5541,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
|
let mailWindowService = Cc["@mozilla.org/messenger/windowservice;1"]
|
|
|
.getService(Ci.nsIMessengerWindowService);
|
|
|
if (!mailWindowService)
|
|
|
-@@ -1495,17 +1495,17 @@ function MsgOpenNewWindowForMessage(mess
|
|
|
+@@ -1494,17 +1494,17 @@ function MsgOpenNewWindowForMessage(mess
|
|
|
// required because on a right-click, the currentIndex value will be
|
|
|
// different from the actual row that is highlighted.
|
|
|
// GetSelectedMsgFolders() will return the message that is
|
|
@@ -5560,7 +5560,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
|
}
|
|
|
|
|
|
function MsgJunk() {
|
|
|
-@@ -1535,17 +1535,17 @@ function MsgMarkMsgAsRead(read) {
|
|
|
+@@ -1534,17 +1534,17 @@ function MsgMarkMsgAsRead(read) {
|
|
|
MarkSelectedMessagesRead(read);
|
|
|
}
|
|
|
|
|
@@ -5579,7 +5579,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
|
let folders = GetSelectedMsgFolders();
|
|
|
for (let folder of folders)
|
|
|
folder.markAllMessagesRead(msgWindow);
|
|
|
-@@ -1615,17 +1615,17 @@ function MsgMarkAllFoldersRead() {
|
|
|
+@@ -1614,17 +1614,17 @@ function MsgMarkAllFoldersRead() {
|
|
|
|
|
|
function MsgFilters(emailAddress, folder) {
|
|
|
if (!folder)
|
|
@@ -5598,7 +5598,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
|
if ("refresh" in args && args.refresh) {
|
|
|
args = { refresh: true, folder, filter: args.newFilter };
|
|
|
MsgFilterList(args);
|
|
|
-@@ -1765,17 +1765,17 @@ function MsgSendUnsentMsgs() {
|
|
|
+@@ -1764,17 +1764,17 @@ function MsgSendUnsentMsgs() {
|
|
|
|
|
|
function PrintEnginePrintInternal(aDoPrintPreview, aMsgType) {
|
|
|
var messageList = gFolderDisplay.selectedMessageUris;
|
|
@@ -5617,7 +5617,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
|
}
|
|
|
|
|
|
function PrintEnginePrint() {
|
|
|
-@@ -1853,17 +1853,17 @@ function getMessageBrowser() {
|
|
|
+@@ -1852,17 +1852,17 @@ function getMessageBrowser() {
|
|
|
// The zoom manager, view source and possibly some other functions still rely
|
|
|
// on the getBrowser function.
|
|
|
function getBrowser() {
|
|
@@ -5636,7 +5636,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
|
function MsgUpdateMsgCount() {}
|
|
|
function MsgImport() {}
|
|
|
function MsgSynchronize() {}
|
|
|
-@@ -2618,17 +2618,17 @@ function IgnoreMDNResponse() {
|
|
|
+@@ -2617,17 +2617,17 @@ function IgnoreMDNResponse() {
|
|
|
* chosen.
|
|
|
*
|
|
|
* @param [aFolder] the folder to open the search window for, if different from
|
|
@@ -5655,7 +5655,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
|
return;
|
|
|
Services.prefs.setBoolPref("mailnews.ui.junk.firstuse", false);
|
|
|
|
|
|
-@@ -2638,26 +2638,26 @@ function MsgJunkMailInfo(aCheckFirstUse)
|
|
|
+@@ -2637,26 +2637,26 @@ function MsgJunkMailInfo(aCheckFirstUse)
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -5840,7 +5840,7 @@ diff --git a/suite/mailnews/content/messenger.xhtml b/suite/mailnews/content/mes
|
|
|
diff --git a/suite/mailnews/content/msgHdrViewOverlay.js b/suite/mailnews/content/msgHdrViewOverlay.js
|
|
|
--- a/suite/mailnews/content/msgHdrViewOverlay.js
|
|
|
+++ b/suite/mailnews/content/msgHdrViewOverlay.js
|
|
|
-@@ -1358,30 +1358,30 @@ createNewAttachmentInfo.prototype.saveAt
|
|
|
+@@ -1357,30 +1357,30 @@ createNewAttachmentInfo.prototype.saveAt
|
|
|
false);
|
|
|
}
|
|
|
|
|
@@ -6012,7 +6012,7 @@ diff --git a/suite/mailnews/jar.mn b/suite/mailnews/jar.mn
|
|
|
diff --git a/suite/mailnews/modules/MailUtils.js b/suite/mailnews/modules/MailUtils.js
|
|
|
--- a/suite/mailnews/modules/MailUtils.js
|
|
|
+++ b/suite/mailnews/modules/MailUtils.js
|
|
|
-@@ -87,14 +87,14 @@ var MailUtils =
|
|
|
+@@ -86,14 +86,14 @@ var MailUtils =
|
|
|
openMessageInNewWindow: function MailUtils_openMessageInNewWindow(aMsgHdr)
|
|
|
{
|
|
|
// Pass in the message URI as messageWindow.js doesn't handle message headers
|
|
@@ -6102,7 +6102,7 @@ diff --git a/suite/themes/classic/jar.mn b/suite/themes/classic/jar.mn
|
|
|
diff --git a/suite/themes/classic/mac/navigator/navigator.css b/suite/themes/classic/mac/navigator/navigator.css
|
|
|
--- a/suite/themes/classic/mac/navigator/navigator.css
|
|
|
+++ b/suite/themes/classic/mac/navigator/navigator.css
|
|
|
-@@ -773,19 +773,19 @@ toolbar[mode="text"] toolbarbutton.chevr
|
|
|
+@@ -779,19 +779,19 @@ toolbar[mode="text"] toolbarbutton.chevr
|
|
|
#editBookmarkPanelHeader {
|
|
|
margin-bottom: 6px;
|
|
|
}
|