1
0
Gildas 4 жил өмнө
parent
commit
a4bc7027ab

+ 0 - 4
extension/core/bg/autosave.js

@@ -47,10 +47,6 @@ export {
 };
 
 async function onMessage(message, sender) {
-	if (message.method.endsWith(".init")) {
-		const [options, autoSaveEnabled] = await Promise.all([config.getOptions(sender.tab.url, true), autoSaveIsEnabled(sender.tab)]);
-		return { options, autoSaveEnabled, tabId: sender.tab.id, tabIndex: sender.tab.index };
-	}
 	if (message.method.endsWith(".save")) {
 		if (message.autoSaveDiscard || message.autoSaveRemove) {
 			if (sender.tab) {

+ 36 - 0
extension/core/bg/bootstrap.js

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2020 Gildas Lormeau
+ * contact : gildas.lormeau <at> gmail.com
+ * 
+ * This file is part of SingleFile.
+ *
+ *   The code in this file is free software: you can redistribute it and/or 
+ *   modify it under the terms of the GNU Affero General Public License 
+ *   (GNU AGPL) as published by the Free Software Foundation, either version 3
+ *   of the License, or (at your option) any later version.
+ * 
+ *   The code in this file is distributed in the hope that it will be useful, 
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero 
+ *   General Public License for more details.
+ *
+ *   As additional permission under GNU AGPL version 3 section 7, you may 
+ *   distribute UNMODIFIED VERSIONS OF THIS file without the copy of the GNU 
+ *   AGPL normally required by section 4, provided you include this license 
+ *   notice and a URL through which recipients can access the Corresponding 
+ *   Source.
+ */
+
+import * as config from "./config.js";
+import { autoSaveIsEnabled } from "./autosave-util.js";
+
+export {
+	onMessage	
+};
+
+async function onMessage(message, sender) {
+	if (message.method.endsWith(".init")) {
+		const [options, autoSaveEnabled] = await Promise.all([config.getOptions(sender.tab.url, true), autoSaveIsEnabled(sender.tab)]);
+		return { options, autoSaveEnabled, tabId: sender.tab.id, tabIndex: sender.tab.index };
+	}
+}

+ 4 - 0
extension/core/bg/index.js

@@ -24,6 +24,7 @@
 /* global browser */
 
 import * as config from "./config.js";
+import * as bootstrap from "./bootstrap.js";
 import * as autosave from "./autosave.js";
 import * as bookmarks from "./bookmarks.js";
 import * as companion from "./companion.js";
@@ -70,6 +71,9 @@ browser.runtime.onMessage.addListener((message, sender) => {
 	if (message.method.startsWith("requests.")) {
 		return requests.onMessage(message, sender);
 	}
+	if (message.method.startsWith("bootstrap.")) {
+		return bootstrap.onMessage(message, sender);
+	}
 });
 if (browser.runtime.onMessageExternal) {
 	browser.runtime.onMessageExternal.addListener(async (message, sender) => {

+ 1 - 1
extension/core/content/content-bootstrap.js

@@ -32,7 +32,7 @@ singlefile.pageInfo = {
 	updatedResources: {},
 	visitDate: new Date()
 };
-browser.runtime.sendMessage({ method: "autosave.init" }).then(message => {
+browser.runtime.sendMessage({ method: "bootstrap.init" }).then(message => {
 	options = message.options;
 	tabId = message.tabId;
 	tabIndex = message.tabIndex;