Simplify

codeminders · May 16, 2023 · 0fd362b · 0fd362b
1 parent f504215
commit 0fd362b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/aify.xpi b/aify.xpi
diff --git a/plugin/html/settings.js b/plugin/html/settings.js
@@ -124,24 +124,6 @@ const getModels = async (apiKeyInput, getModelsButton) => {
 	getModelsButton.disabled = true;
 };
 
-const handleDOMContentLoad = (modelSelect, apiKeyInput, actionsContainer, addActionButton, saveButton, getModelsButton, maxTokensInput, defaultButton, notesContainer) => {
-    browser.storage.local.get(["model", "apiKey", "actions", "maxTokens", "promptUpdated"], (data) => {
-        const { model = defaultModel, apiKey = '', maxTokens = 0, promptUpdated = 0, actions = defaultActions } = data;
-
-        apiKeyInput.value = apiKey;
-        addModelToSelect(model, modelSelect);
-        maxTokensInput.value = maxTokens;
-        handleWarning(promptUpdated, notesContainer);
-
-        actions.forEach(({ name, prompt }) => addAction(name, prompt, actionsContainer));
-
-        addActionButton.addEventListener("click", () => addAction("", "", actionsContainer));
-        saveButton.addEventListener("click", () => saveSettings(actionsContainer, modelSelect, apiKeyInput, maxTokensInput));
-        defaultButton.addEventListener("click", () => setDefaultSettings(actionsContainer, modelSelect, apiKeyInput, maxTokensInput));
-        getModelsButton.addEventListener("click", () => getModels(apiKeyInput, getModelsButton));
-    });
-}
-
 const addModelToSelect = (model, modelSelect) => {
     let option = document.createElement("option");
     option.value = model;
@@ -161,5 +143,19 @@ document.addEventListener("DOMContentLoaded", () => {
     const defaultButton = document.getElementById("default-settings");
     const notesContainer = document.getElementById("notes-container");
 
-    handleDOMContentLoad(modelSelect, apiKeyInput, actionsContainer, addActionButton, saveButton, getModelsButton, maxTokensInput, defaultButton, notesContainer);
+    browser.storage.local.get(["model", "apiKey", "actions", "maxTokens", "promptUpdated"], (data) => {
+        const { model = defaultModel, apiKey = '', maxTokens = 0, promptUpdated = 0, actions = defaultActions } = data;
+
+        apiKeyInput.value = apiKey;
+        addModelToSelect(model, modelSelect);
+        maxTokensInput.value = maxTokens;
+        handleWarning(promptUpdated, notesContainer);
+
+        actions.forEach(({ name, prompt }) => addAction(name, prompt, actionsContainer));
+
+        addActionButton.addEventListener("click", () => addAction("", "", actionsContainer));
+        saveButton.addEventListener("click", () => saveSettings(actionsContainer, modelSelect, apiKeyInput, maxTokensInput));
+        defaultButton.addEventListener("click", () => setDefaultSettings(actionsContainer, modelSelect, apiKeyInput, maxTokensInput));
+        getModelsButton.addEventListener("click", () => getModels(apiKeyInput, getModelsButton));
+    });
 });
diff --git a/plugin/manifest.json b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Aify",
-  "version": "1.10",
+  "version": "1.11",
   "description": "A Thunderbird plugin to rewrite text based on user-selected actions using OpenAI's API.",
   "author": "Ali Raheem",
   "browser_specific_settings": {