From dcb2704a283159eebd0d1d22c098fe9cf0578d0a Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 14 Feb 2018 16:22:48 +0000
Subject: [PATCH] Merge Modals.pluginSettings and Modals.themeSettings to a
 single function for both

---
 client/src/modules/plugin.js                | 2 +-
 client/src/modules/theme.js                 | 2 +-
 client/src/ui/components/bd/PluginsView.vue | 2 +-
 client/src/ui/components/bd/ThemesView.vue  | 2 +-
 client/src/ui/modals.js                     | 8 ++------
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/client/src/modules/plugin.js b/client/src/modules/plugin.js
index b4fd7fec..3c944897 100644
--- a/client/src/modules/plugin.js
+++ b/client/src/modules/plugin.js
@@ -74,7 +74,7 @@ export default class Plugin {
     }
 
     showSettingsModal() {
-        return Modals.pluginSettings(this);
+        return Modals.contentSettings(this);
     }
 
     async saveSettings(newSettings) {
diff --git a/client/src/modules/theme.js b/client/src/modules/theme.js
index 75506d9e..34081010 100644
--- a/client/src/modules/theme.js
+++ b/client/src/modules/theme.js
@@ -64,7 +64,7 @@ export default class Theme {
     get events() { return this.EventEmitter ? this.EventEmitter : (this.EventEmitter = new ThemeEvents(this)) }
 
     showSettingsModal() {
-        return Modals.themeSettings(this);
+        return Modals.contentSettings(this);
     }
 
     async saveSettings(newSettings) {
diff --git a/client/src/ui/components/bd/PluginsView.vue b/client/src/ui/components/bd/PluginsView.vue
index 306bd84b..d7a664ed 100644
--- a/client/src/ui/components/bd/PluginsView.vue
+++ b/client/src/ui/components/bd/PluginsView.vue
@@ -89,7 +89,7 @@
                 })();
             },
             showSettings(plugin) {
-                return Modals.pluginSettings(plugin);
+                return Modals.contentSettings(plugin);
             }
         }
     }
diff --git a/client/src/ui/components/bd/ThemesView.vue b/client/src/ui/components/bd/ThemesView.vue
index c98f389b..101a06e7 100644
--- a/client/src/ui/components/bd/ThemesView.vue
+++ b/client/src/ui/components/bd/ThemesView.vue
@@ -89,7 +89,7 @@
                 })();
             },
             showSettings(theme) {
-                return Modals.themeSettings(theme);
+                return Modals.contentSettings(theme);
             }
         }
     }
diff --git a/client/src/ui/modals.js b/client/src/ui/modals.js
index 4cecb25f..e4e869c1 100644
--- a/client/src/ui/modals.js
+++ b/client/src/ui/modals.js
@@ -108,12 +108,8 @@ export default class {
         return this.settings(set.headertext, set.settings, null, null, newSettings => Settings.saveSettings(set.id, newSettings));
     }
 
-    static pluginSettings(plugin) {
-        return this.settings(plugin.name + ' Settings', plugin.config, null, null, plugin.saveSettings.bind(plugin));
-    }
-
-    static themeSettings(theme) {
-        return this.settings(theme.name + ' Settings', theme.config, null, null, theme.saveSettings.bind(theme));
+    static contentSettings(content) {
+        return this.settings(content.name + ' Settings', content.config, null, null, content.saveSettings.bind(content));
     }
 
     static get stack() {