[FB] SSB | Bug fix

Floorp-Projects · May 11, 2024 · 3312bd6 · 3312bd6
1 parent 1637ffc
commit 3312bd6
Show file tree

Hide file tree

Showing 32 changed files with 44 additions and 55,169 deletions.
diff --git a/Floorp-private-components b/Floorp-private-components
diff --git a/browser/base/content/browser-browserActions.mjs b/browser/base/content/browser-browserActions.mjs
@@ -98,7 +98,7 @@ export const gFloorpBrowserActions = {
       "undoCloseTab();"
     ).then(() => {
       if (
-        ChromeUtils.importESModule("resource:///modules/FloorpStartup.sys.mjs")
+        ChromeUtils.importESModule("resource://floorp/FloorpStartup.sys.mjs")
           .isFirstRun
       ) {
         CustomizableUI.addWidgetToArea(
@@ -117,7 +117,7 @@ export const gFloorpBrowserActions = {
       "SidebarUI.reversePosition();"
     ).then(() => {
       if (
-        ChromeUtils.importESModule("resource:///modules/FloorpStartup.sys.mjs")
+        ChromeUtils.importESModule("resource://floorp/FloorpStartup.sys.mjs")
           .isFirstRun
       ) {
         CustomizableUI.addWidgetToArea(

diff --git a/browser/base/content/browser-preferences.mjs b/browser/base/content/browser-preferences.mjs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
  let { userJsList } = ChromeUtils.importESModule(
-  "resource:///modules/UserjsUtils.sys.mjs",
+  "resource://floorp/UserjsUtils.sys.mjs",
 );
 
 // I glared at the source code for about 3 hours, but for some reason I decided to use the server because it would be unclear because of the Floorp interface settings. God forgive me

diff --git a/browser/base/content/browser-ssb-support.mjs b/browser/base/content/browser-ssb-support.mjs
@@ -27,9 +27,9 @@ export const gSsbSupport = {
       });
 
       // This is needed to handle the case when the user opens a new tab in the same window.
-      window.setTimeout(() => {
-        gSsbSupport.eventListeners.onCurrentTabChangedOrLoaded();
-      }, 1000);
+        window.setInterval(() => {
+          gSsbSupport.eventListeners.onCurrentTabChangedOrLoaded();
+        } , 1000);
 
       this._initialized = true;
     } else {

diff --git a/browser/base/content/floorp-scripts.inc b/browser/base/content/floorp-scripts.inc
@@ -7,7 +7,7 @@
 
 // This ESM has build configuration constants.
 var { FloorpAppConstants } = ChromeUtils.importESModule(
-    "resource:///modules/FloorpAppConstants.sys.mjs"
+    "resource://floorp/FloorpAppConstants.sys.mjs"
 );
 
 import("chrome://browser/content/browser-ua-data.mjs");

diff --git a/browser/components/FloorpActors.sys.mjs b/browser/components/FloorpActors.sys.mjs
@@ -8,18 +8,15 @@ export const EXPORTED_SYMBOLS = [];
 import { ActorManagerParent } from "resource://gre/modules/ActorManagerParent.sys.mjs";
 
 export let JSWINDOWACTORS = {
-  AboutCalendar: {
+  SiteSpecificBrowser: {
     parent: {
-      esModuleURI: "resource:///actors/AboutCalendarParent.sys.mjs",
+      esModuleURI: "resource://floorp/ssb/SiteSpecificBrowserParent.sys.mjs",
     },
     child: {
-      esModuleURI: "resource:///actors/AboutCalendarChild.sys.mjs",
-      events: {
-        DOMDocElementInserted: {},
-      },
+      esModuleURI: "resource://floorp/ssb/SiteSpecificBrowserChild.sys.mjs",
     },
-    matches: ["about:calendar*"],
-    remoteTypes: ["privilegedabout"],
+
+    allFrames: true,
   },
 };
 

diff --git a/browser/components/FloorpStartup.sys.mjs b/browser/components/FloorpStartup.sys.mjs
@@ -185,7 +185,7 @@ if (isMainBrowser) {
 if (isMainBrowser) {
   // Load actors
   try {
-    ChromeUtils.importESModule("resource:///modules/FloorpActors.sys.mjs");
+    ChromeUtils.importESModule("resource://floorp/FloorpActors.sys.mjs");
   } catch (e) {
     console.error(e);
   }
@@ -223,7 +223,7 @@ if (isMainBrowser) {
   // Load PortableUpdate feature
   try {
     if (Services.prefs.getBoolPref("floorp.isPortable", false)) {
-      ChromeUtils.importESModule("resource:///modules/PortableUpdate.sys.mjs");
+      ChromeUtils.importESModule("resource://floorp/PortableUpdate.sys.mjs");
     }
   } catch (e) {
     console.error(e);

diff --git a/browser/components/OpenLinkInExternal.sys.mjs b/browser/components/OpenLinkInExternal.sys.mjs
@@ -9,8 +9,8 @@ import { FileUtils } from "resource://gre/modules/FileUtils.sys.mjs";
 import { ExtensionCommon } from "resource://gre/modules/ExtensionCommon.sys.mjs";
 import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
 import { Subprocess } from "resource://gre/modules/Subprocess.sys.mjs";
-import { DesktopFileParser } from "resource:///modules/DesktopFileParser.sys.mjs";
-import { EscapeShell } from "resource:///modules/EscapeShell.sys.mjs";
+import { DesktopFileParser } from "resource://floorp/DesktopFileParser.sys.mjs";
+import { EscapeShell } from "resource://floorp/EscapeShell.sys.mjs";
 
 // Migration from JSM to ES Module in the future.
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");

diff --git a/browser/components/calendar/actors/AboutCalendarChild.sys.mjs b/browser/components/calendar/actors/AboutCalendarChild.sys.mjs
diff --git a/browser/components/calendar/actors/AboutCalendarParent.sys.mjs b/browser/components/calendar/actors/AboutCalendarParent.sys.mjs
diff --git a/browser/components/calendar/content/calendar.html b/browser/components/calendar/content/calendar.html