|
@@ -3,7 +3,7 @@
|
|
|
# Date 1641471337 18000
|
|
|
# Thu Jan 06 07:15:37 2022 -0500
|
|
|
# Node ID b26cee1637d4d447b316f7466fd88cf523119dc4
|
|
|
-# Parent 5b32f73fa7543038023e3cca9e0f0ffe246553df
|
|
|
+# Parent 8d6f5b2f7da23339c8ee67bad4f3e2dac2fb5d5f
|
|
|
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);
|
|
|
-@@ -748,18 +748,18 @@ pref("privacy.clearOnShutdown.siteSettin
|
|
|
+@@ -749,18 +749,18 @@ pref("privacy.clearOnShutdown.siteSettin
|
|
|
pref("privacy.warn_tracking_content", true);
|
|
|
|
|
|
// Switching this on will also spoof our user agent and other potentially
|
|
@@ -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
|
|
|
-@@ -1786,17 +1786,17 @@ function subscribeToFeedMiddleClick(href
|
|
|
+@@ -1787,17 +1787,17 @@ function subscribeToFeedMiddleClick(href
|
|
|
}
|
|
|
|
|
|
function OpenSearchEngineManager() {
|
|
@@ -4958,7 +4958,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
|
|
|
-@@ -300,17 +300,17 @@ function onEditFilter()
|
|
|
+@@ -307,17 +307,17 @@ function onEditFilter()
|
|
|
return;
|
|
|
|
|
|
var selectedFilter = currentFilter();
|
|
@@ -4971,13 +4971,13 @@ diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content
|
|
|
+ window.openDialog("chrome://messenger/content/FilterEditor.xhtml", "FilterEditor", "chrome,modal,titlebar,resizable,centerscreen", args);
|
|
|
|
|
|
if ("refresh" in args && args.refresh) {
|
|
|
+ // Reset search if edit was okay (name change might lead to hidden entry).
|
|
|
+ resetSearchBox(selectedFilter);
|
|
|
rebuildFilterList();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * Handler function for the 'New...' buttons.
|
|
|
-@@ -358,17 +358,17 @@ function calculatePositionAndShowCreateF
|
|
|
+@@ -367,17 +367,17 @@ function calculatePositionAndShowCreateF
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -4993,12 +4993,12 @@ diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content
|
|
|
|
|
|
if (args.refresh)
|
|
|
{
|
|
|
+ // On success: reset the search box if necessary!
|
|
|
+ resetSearchBox(args.newFilter);
|
|
|
rebuildFilterList();
|
|
|
+@@ -530,17 +530,17 @@ function moveFilter(motion) {
|
|
|
|
|
|
- // Select the new filter, it is at the position of previous selection.
|
|
|
-@@ -489,17 +489,17 @@ function moveFilter(motion) {
|
|
|
-
|
|
|
- moveCurrentFilter(moveFilterNative);
|
|
|
+ rebuildFilterList();
|
|
|
}
|
|
|
|
|
|
function viewLog()
|