Fix TB

frg/work-js/comm-release/patches/1389960-57a1.patch

@@ -36,7 +36,7 @@ diff --git a/mail/components/devtools/devtools-loader.js b/mail/components/devto
    },
  
    initialize: function() {
-     var { devtools, require, DevToolsLoader } = ChromeUtils.defineModuleGetter.import("resource://devtools/shared/Loader.jsm", {});
+     var { devtools, require, DevToolsLoader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
      var { DebuggerServer } = require("devtools/server/main");
      var { gDevTools } = require("devtools/client/framework/devtools");
 -    var HUDService = require("devtools/client/webconsole/hudservice");

frg/work-js/comm-release/patches/1434737-2-60a1.patch

@@ -3361,7 +3361,7 @@ diff --git a/mail/components/devtools/devtools-loader.js b/mail/components/devto
  
    handleDevToolsFlag: function (cmdLine) {
 -    Cu.import("resource://devtools/client/framework/ToolboxProcess.jsm");
-+    ChromeUtils.defineModuleGetter.import("resource://devtools/client/framework/ToolboxProcess.jsm");
++    ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm");
      BrowserToolboxProcess.init();
  
      if (cmdLine.state == Ci.nsICommandLine.STATE_REMOTE_AUTO) {
@@ -3371,7 +3371,7 @@ diff --git a/mail/components/devtools/devtools-loader.js b/mail/components/devto
  
    initialize: function() {
 -    var { devtools, require, DevToolsLoader } = Cu.import("resource://devtools/shared/Loader.jsm", {});
-+    var { devtools, require, DevToolsLoader } = ChromeUtils.defineModuleGetter.import("resource://devtools/shared/Loader.jsm", {});
++    var { devtools, require, DevToolsLoader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
      var { DebuggerServer } = require("devtools/server/main");
      var { gDevTools } = require("devtools/client/framework/devtools");
      var HUDService = require("devtools/client/webconsole/hudservice");

frg/work-js/comm-release/patches/1470307-1-PARTIAL-BACKOUT-25320.patch

@@ -0,0 +1,103 @@
+# HG changeset patch
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
+# Date 1720992035 -7200
+# Parent  3a317cda5f34f397be67e3d2f090bec0728fbab3
+Bug 1470307 - Back out not implemented tab preferences code. r=me a=me
+
+diff --git a/calendar/lightning/content/messenger-overlay-preferences.js b/calendar/lightning/content/messenger-overlay-preferences.js
+--- a/calendar/lightning/content/messenger-overlay-preferences.js
++++ b/calendar/lightning/content/messenger-overlay-preferences.js
+@@ -12,40 +12,25 @@
+ /* import-globals-from ../../base/content/preferences/general.js */
+ /* import-globals-from ../../base/content/preferences/views.js */
+ 
+ var gLightningPane = {
+     mInitialized: false,
+ 
+     init: function() {
+         let preference = document.getElementById("calendar.preferences.lightning.selectedTabIndex");
+-        let ltnPrefs = document.getElementById("calPreferencesTabbox");
+         if (preference.value) {
++            let ltnPrefs = document.getElementById("calPreferencesTabbox");
+             ltnPrefs.selectedIndex = preference.value;
+         }
+-        ltnPrefs.addEventListener("select", gLightningPane.tabSelectionChanged.bind(this));
+         this.mInitialized = true;
+-
+-        let lightningButton = document.documentElement._makePaneButton(document.getElementById("paneLightning"));
+-        let advancedButton = document.querySelector('#category-box radio[pane="paneAdvanced"]');
+-        advancedButton.parentNode.insertBefore(lightningButton, advancedButton);
+-
+-        let elements = document.querySelectorAll("#paneLightning preference");
+-        for (let element of elements) {
+-            element.updateElements();
+-        }
+     },
+ 
+     tabSelectionChanged: function() {
+         if (!this.mInitialized) {
+             return;
+         }
+         let ltnPrefs = document.getElementById("calPreferencesTabbox");
+         let preference = document.getElementById("calendar.preferences.lightning.selectedTabIndex");
+         preference.valueFromPreferences = ltnPrefs.selectedIndex;
+     }
+ };
+ 
+-gCalendarGeneralPane.init();
+-gAlarmsPane.init();
+-gCategoriesPane.init();
+-gViewsPane.init();
+-gLightningPane.init();
+diff --git a/calendar/lightning/content/messenger-overlay-preferences.xul b/calendar/lightning/content/messenger-overlay-preferences.xul
+--- a/calendar/lightning/content/messenger-overlay-preferences.xul
++++ b/calendar/lightning/content/messenger-overlay-preferences.xul
+@@ -12,26 +12,29 @@
+ ]>
+ 
+ <?xml-stylesheet href="chrome://lightning/skin/lightning.css"?>
+ 
+ <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ 
+     <prefwindow id="MailPreferences">
+         <prefpane id="paneLightning"
+-                  flex="1"
+                   insertbefore="paneAdvanced"
+-                  label="&lightning.preferencesLabel;">
++                  label="&lightning.preferencesLabel;"
++                  onpaneload="gCalendarGeneralPane.init(); gAlarmsPane.init();
++                              gCategoriesPane.init(); gViewsPane.init();
++                              gLightningPane.init();">
+             <preferences>
+                 <preference id="calendar.preferences.lightning.selectedTabIndex"
+                             name="calendar.preferences.lightning.selectedTabIndex"
+                             type="int"/>
+             </preferences>
+             <tabbox id="calPreferencesTabbox"
+-                    flex="1">
++                    flex="1"
++                    onselect="gLightningPane.tabSelectionChanged();">
+                 <tabs>
+                     <tab id="calPreferencesTabGeneral"
+                          label="&paneGeneral.title;"/>
+                     <tab id="calPreferencesTabAlarms"
+                          label="&paneAlarms.title;"/>
+                     <tab id="calPreferencesTabCategories"
+                          label="&paneCategories.title;"/>
+                     <tab id="calPreferencesTabViews"
+@@ -49,13 +52,13 @@
+                     </tabpanel>
+                     <tabpanel orient="vertical">
+                         <vbox id="calPreferencesBoxViews"/>
+                     </tabpanel>
+                 </tabpanels>
+             </tabbox>
+         </prefpane>
+ 
++        <script src="chrome://lightning/content/messenger-overlay-preferences.js"/>
++
+     </prefwindow>
+ 
+-    <script src="chrome://lightning/content/messenger-overlay-preferences.js"/>
+-
+ </overlay>

frg/work-js/comm-release/patches/series

@@ -2171,6 +2171,7 @@ TOP-1872623-cancelbookmark-25319.patch
 TOP-1906540-mozdevice-removal-comm-25320.patch
 9999999-debugqa-esr128-25320.patch
 1434951-60a1.patch
+1470307-1-PARTIAL-BACKOUT-25320.patch
 
 
 

frg/work-js/comm-release/patches/series-test

@@ -2171,3 +2171,4 @@ TOP-1872623-cancelbookmark-25319.patch
 TOP-1906540-mozdevice-removal-comm-25320.patch
 9999999-debugqa-esr128-25320.patch
 1434951-60a1.patch
+1470307-1-PARTIAL-BACKOUT-25320.patch