Переглянути джерело

dont call ui.button methods directly

Gildas 6 роки тому
батько
коміт
c5880b7e69
2 змінених файлів з 10 додано та 4 видалено
  1. 4 4
      extension/core/bg/core.js
  2. 6 0
      extension/ui/bg/bg-ui.js

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

@@ -80,7 +80,7 @@ singlefile.core = (() => {
 						await singlefile.tabs.sendMessage(tab.id, { method: "content.autosave", options });
 					}
 				} else {
-					singlefile.ui.button.onInitialize(tabId, options, 1);
+					singlefile.ui.onInitialize(tabId, options, 1);
 					const mergedOptions = await singlefile.config.getOptions(tab.url);
 					Object.keys(options).forEach(key => mergedOptions[key] = options[key]);
 					let scriptsInjected;
@@ -99,18 +99,18 @@ singlefile.core = (() => {
 						// ignored
 					}
 					if (scriptsInjected) {
-						singlefile.ui.button.onInitialize(tabId, options, 2);
+						singlefile.ui.onInitialize(tabId, options, 2);
 						if (mergedOptions.frameId) {
 							await browser.tabs.executeScript(tab.id, { code: "document.documentElement.dataset.requestedFrameId = true", frameId: mergedOptions.frameId, matchAboutBlank: true, runAt: "document_start" });
 						}
 						await singlefile.tabs.sendMessage(tab.id, { method: "content.save", options: mergedOptions });
 					} else {
-						singlefile.ui.button.onForbiddenDomain(tab, options);
+						singlefile.ui.onForbiddenDomain(tab, options);
 					}
 				}
 			} catch (error) {
 				console.log(error); // eslint-disable-line no-console
-				singlefile.ui.button.onError(tabId, options);
+				singlefile.ui.onError(tabId, options);
 			}
 		}
 	}

+ 6 - 0
extension/ui/bg/bg-ui.js

@@ -33,6 +33,12 @@ singlefile.ui = (() => {
 		async refresh(tab) {
 			return Promise.all([singlefile.ui.menu.refresh(tab), singlefile.ui.button.refresh(tab, { autoSave: await singlefile.autosave.isEnabled(tab) })]);
 		},
+		onForbiddenDomain(tab, options) {
+			singlefile.ui.button.onForbiddenDomain(tab, options);
+		},
+		onInitialize(tabId, options, step) {
+			singlefile.ui.button.onInitialize(tabId, options, step);
+		},
 		onProgress(tabId, index, maxIndex, options) {
 			singlefile.ui.button.onProgress(tabId, index, maxIndex, options);
 		},