From 6d44a579a44f4420e6ab60e2c6655f7bcf2e429e Mon Sep 17 00:00:00 2001 From: Araxeus <78568641+Araxeus@users.noreply.github.com> Date: Mon, 5 Apr 2021 04:21:52 +0300 Subject: [PATCH] move prompt to provide --- menu.js | 19 ++++++++++++------- .../prompt}/customTitlebar.js | 0 {prompt => providers/prompt}/darkPrompt.css | 0 {prompt => providers/prompt}/index.js | 0 {prompt => providers/prompt}/page/prompt.css | 0 {prompt => providers/prompt}/page/prompt.html | 0 {prompt => providers/prompt}/page/prompt.js | 0 7 files changed, 12 insertions(+), 7 deletions(-) rename {prompt => providers/prompt}/customTitlebar.js (100%) rename {prompt => providers/prompt}/darkPrompt.css (100%) rename {prompt => providers/prompt}/index.js (100%) rename {prompt => providers/prompt}/page/prompt.css (100%) rename {prompt => providers/prompt}/page/prompt.html (100%) rename {prompt => providers/prompt}/page/prompt.js (100%) diff --git a/menu.js b/menu.js index 18764681..3754d14c 100644 --- a/menu.js +++ b/menu.js @@ -6,7 +6,7 @@ const is = require("electron-is"); const { getAllPlugins } = require("./plugins/utils"); const config = require("./config"); -const prompt = require('./prompt'); +const prompt = require('./providers/prompt'); const pluginEnabledMenu = (win, plugin, label = "", hasSubmenu = false) => ({ label: label || plugin, @@ -321,13 +321,18 @@ function setProxy(item, win) { }, type: 'input', icon: iconPath, - customStylesheet: path.join(__dirname, "prompt", "darkPrompt.css"), - frame: false, - customScript: path.join(__dirname, "prompt", "customTitlebar.js"), - enableRemoteModule: true, - height: 200, - width: 450, + customStylesheet: path.join(__dirname, "providers", "prompt", "darkPrompt.css"), }; + //TODO: custom bar on prompt need testing on macOS + if(!is.macOS()) { + Object.assign(options, { + frame: false, + customScript: path.join(__dirname, "providers", "prompt", "customTitlebar.js"), + enableRemoteModule: true, + height: 200, + width: 450, + }); + } prompt(options, win) .then((input) => { if (input !== null && input !== example) { diff --git a/prompt/customTitlebar.js b/providers/prompt/customTitlebar.js similarity index 100% rename from prompt/customTitlebar.js rename to providers/prompt/customTitlebar.js diff --git a/prompt/darkPrompt.css b/providers/prompt/darkPrompt.css similarity index 100% rename from prompt/darkPrompt.css rename to providers/prompt/darkPrompt.css diff --git a/prompt/index.js b/providers/prompt/index.js similarity index 100% rename from prompt/index.js rename to providers/prompt/index.js diff --git a/prompt/page/prompt.css b/providers/prompt/page/prompt.css similarity index 100% rename from prompt/page/prompt.css rename to providers/prompt/page/prompt.css diff --git a/prompt/page/prompt.html b/providers/prompt/page/prompt.html similarity index 100% rename from prompt/page/prompt.html rename to providers/prompt/page/prompt.html diff --git a/prompt/page/prompt.js b/providers/prompt/page/prompt.js similarity index 100% rename from prompt/page/prompt.js rename to providers/prompt/page/prompt.js