+
+## Usage
+```js
+prompt([options, parentBrowserWindow]).then(...).catch(...)
+```
+Promise resolve returns input
+
+If user presses cancel/exit window, input = null;
+
+On error, Prompise reject returns custom error message
+## Example
+
+```js
+const prompt = require('./providers/prompt');
+
+prompt({
+ title: 'Prompt example',
+ label: 'URL:',
+ value: 'http://example.org',
+ inputAttrs: {
+ type: 'url'
+ },
+ type: 'input'
+})
+.then((r) => {
+ if(r === null) {
+ console.log('user cancelled');
+ } else {
+ console.log('result', r);
+ }
+})
+.catch(console.error);
+```
+
+### Options object (optional)
+
+| Key | Explanation |
+| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| title | (optional, string) The title of the prompt window. Defaults to 'Prompt'. |
+| label | (optional, string) The label which appears on the prompt for the input field. Defaults to 'Please input a value:'. |
+| buttonLabels | (optional, object) The text for the OK/cancel buttons. Properties are 'ok' and 'cancel'. Defaults to null. |
+| value | (optional, string) The default value for the input field. Defaults to null. |
+| type | (optional, string) The type of input field, either 'input' for a standard text input field or 'select' for a dropdown type input. Defaults to 'input'. |
+| inputAttrs | (optional, object) The attributes of the input field, analagous to the HTML attributes: `{type: 'text', required: true}` -> ``. Used if the type is 'input' |
+| selectOptions | (optional, object) The items for the select dropdown if using the 'select' type in the format 'value': 'display text', where the value is what will be given to the then block and the display text is what the user will see. |
+| useHtmlLabel | (optional, boolean) Whether the label should be interpreted as HTML or not. Defaults to false. |
+| width | (optional, integer) The width of the prompt window. Defaults to 370. |
+| minWidth | (optional, integer) The minimum allowed width for the prompt window. Same default value as width. |
+| height | (optional, integer) The height of the prompt window. Defaults to 130. |
+| minHeight | (optional, integer) The minimum allowed height for the prompt window. Same default value as height. |
+| resizable | (optional, boolean) Whether the prompt window can be resized or not (also sets useContentSize). Defaults to false. |
+| alwaysOnTop | (optional, boolean) Whether the window should always stay on top of other windows. Defaults to false |
+| icon | (optional, string) The path to an icon image to use in the title bar. Defaults to null and uses electron's icon. |
+| customStylesheet | (optional, string) The local path of a CSS file to stylize the prompt window. Defaults to null. |
+| menuBarVisible | (optional, boolean) Whether to show the menubar or not. Defaults to false. |
+| skipTaskbar | (optional, boolean) Whether to show the prompt window icon in taskbar. Defaults to true. |
+| frame | (optional, boolean) Wether to create prompt with frame. Defaults to true. |
+| customScript | (optional, string) The local path of a JS file to run on preload. Defaults to null. |
+| enableRemoteModule | (optional, boolean) Wether the prompt window have remote modules activated, Defaults to false. |
+
+If not supplied, it uses the defaults listed in the table above.
+
+### parentBrowserWindow (optional)
+
+The window in which to display the prompt on. If not supplied, the parent window of the prompt will be null.
+
+### customScript (optional)
+
+Create the script with the following template:
+
+```node
+module.exports = () => {
+ // This function will be called as a preload script
+ // So you can use front features like `document.querySelector`
+};
+```
From 80b12076406e5e06a219f5b7824f1f3821b54832 Mon Sep 17 00:00:00 2001
From: Araxeus
Date: Fri, 9 Apr 2021 02:19:06 +0300
Subject: [PATCH 29/52] fix rare crash due to unfocus effect
---
plugins/in-app-menu/front.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/plugins/in-app-menu/front.js b/plugins/in-app-menu/front.js
index 3287dc5d..8ee1c9cf 100644
--- a/plugins/in-app-menu/front.js
+++ b/plugins/in-app-menu/front.js
@@ -6,6 +6,8 @@ module.exports = () => {
const bar = new customTitlebar.Titlebar({
backgroundColor: customTitlebar.Color.fromHex("#050505"),
itemBackgroundColor: customTitlebar.Color.fromHex("#121212"),
+ // !important - unfocus effect can sometimes cause crash as of v3.2.6 of custom-electron-titlebar
+ unfocusEffect: false
});
bar.updateTitle(" ");
document.title = "Youtube Music";
From 3d41d04818ef355cd912e4e6ec7adad081854733 Mon Sep 17 00:00:00 2001
From: Araxeus
Date: Fri, 9 Apr 2021 22:28:55 +0300
Subject: [PATCH 30/52] Revert "fix rare crash due to unfocus effect"
This reverts commit 80b12076406e5e06a219f5b7824f1f3821b54832.
---
plugins/in-app-menu/front.js | 2 --
1 file changed, 2 deletions(-)
diff --git a/plugins/in-app-menu/front.js b/plugins/in-app-menu/front.js
index 8ee1c9cf..3287dc5d 100644
--- a/plugins/in-app-menu/front.js
+++ b/plugins/in-app-menu/front.js
@@ -6,8 +6,6 @@ module.exports = () => {
const bar = new customTitlebar.Titlebar({
backgroundColor: customTitlebar.Color.fromHex("#050505"),
itemBackgroundColor: customTitlebar.Color.fromHex("#121212"),
- // !important - unfocus effect can sometimes cause crash as of v3.2.6 of custom-electron-titlebar
- unfocusEffect: false
});
bar.updateTitle(" ");
document.title = "Youtube Music";
From 09d9f72db289aff51c20fd83538fbb40b3ee652c Mon Sep 17 00:00:00 2001
From: Araxeus
Date: Sat, 10 Apr 2021 02:51:38 +0300
Subject: [PATCH 31/52] add unresponsive listener
---
index.js | 44 ++++++++++++++++++++-----
plugins/in-app-menu/back.js | 10 +-----
preload.js | 2 +-
providers/{logger.js => frontLogger.js} | 2 +-
4 files changed, 39 insertions(+), 19 deletions(-)
rename providers/{logger.js => frontLogger.js} (87%)
diff --git a/index.js b/index.js
index 7fd88754..addd98ed 100644
--- a/index.js
+++ b/index.js
@@ -2,6 +2,7 @@
const path = require("path");
const electron = require("electron");
+const { dialog } = require("electron");
const is = require("electron-is");
const unhandled = require("electron-unhandled");
const { autoUpdater } = require("electron-updater");
@@ -144,7 +145,11 @@ function createMainWindow() {
});
}
});
-
+
+ win.webContents.on("render-process-gone", (event, webContents, details) => {
+ showUnresponsiveDialog(win, details);
+ });
+
win.once("ready-to-show", () => {
if (config.get("options.appVisible")) {
win.show();
@@ -154,13 +159,7 @@ function createMainWindow() {
return win;
}
-let createdWindow = false;
-app.on("browser-window-created", (event, win) => {
- //Ensures listeners are registered only once
- if (createdWindow) {
- return;
- }
- createdWindow = true;
+app.once("browser-window-created", (event, win) => {
loadPlugins(win);
win.webContents.on("did-fail-load", (
@@ -325,3 +324,32 @@ app.on("ready", () => {
});
}
});
+
+function showUnresponsiveDialog(win, details) {
+ if (!!details) {
+ console.log("Unresponsive Error!\n"+JSON.stringify(details, null, "\t"))
+ }
+ dialog.showMessageBox(win, {
+ type: "error",
+ title: "Window Unresponsive",
+ message: "The Application is Unresponsive",
+ details: "We are sorry for the inconveniance! please choose what to do with the application:",
+ buttons: ["Wait", "Relaunch", "Quit"],
+ cancelId: 0
+ }).then( response => {
+ switch (response) {
+ case 1: //if relaunch - relaunch+exit
+ app.relaunch();
+ case 2:
+ app.exit();
+ break;
+ case 0:
+ default:
+ return;
+ //maybe set a timer and afterwards check responsivness and call function again if failed
+ }
+ });
+}
+
+module.exports.aDialog = showUnresponsiveDialog;
+
diff --git a/plugins/in-app-menu/back.js b/plugins/in-app-menu/back.js
index 938c5475..8365ac8b 100644
--- a/plugins/in-app-menu/back.js
+++ b/plugins/in-app-menu/back.js
@@ -7,8 +7,6 @@ const config = require("../../config");
const { setApplicationMenu } = require("../../menu");
const { injectCSS } = require("../utils");
-//check that menu doesn't get created twice
-let calledReadyToShow = false;
//tracks menu visibility
let visible = true;
// win hook for fixing menu
@@ -30,13 +28,7 @@ module.exports = (winImport) => {
// css for custom scrollbar + disable drag area(was causing bugs)
injectCSS(win.webContents, path.join(__dirname, "style.css"));
- win.on("ready-to-show", () => {
- // (apparently ready-to-show is called twice)
- if (calledReadyToShow) {
- return;
- }
-
- calledReadyToShow = true;
+ win.once("ready-to-show", () => {
setApplicationMenu(win);
diff --git a/preload.js b/preload.js
index f25dd6b7..5fcb2e07 100644
--- a/preload.js
+++ b/preload.js
@@ -34,7 +34,7 @@ document.addEventListener("DOMContentLoaded", () => {
fileExists(songInfoProviderPath, require(songInfoProviderPath));
// inject front logger
- const loggerPath = path.join(__dirname, "providers", "logger.js")
+ const loggerPath = path.join(__dirname, "providers", "frontLogger.js")
fileExists(loggerPath, require(loggerPath));
// Add action for reloading
diff --git a/providers/logger.js b/providers/frontLogger.js
similarity index 87%
rename from providers/logger.js
rename to providers/frontLogger.js
index 730a3dfa..210e3ff8 100644
--- a/providers/logger.js
+++ b/providers/frontLogger.js
@@ -3,7 +3,7 @@ const { ipcRenderer } = require("electron");
function logToString(log) {
let string = (typeof log === "string") ? log : log.toString();
if (!string || string.includes("[object Object]")) {
- string = JSON.stringify(log);
+ string = JSON.stringify(log, null, "\t");
}
return string;
}
From c764d657d74fc5d85d0410ec1115d42e84bdc7df Mon Sep 17 00:00:00 2001
From: Araxeus
Date: Wed, 14 Apr 2021 13:42:39 +0300
Subject: [PATCH 32/52] cleanup unresponsiveDialog
---
index.js | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/index.js b/index.js
index addd98ed..13eaa2db 100644
--- a/index.js
+++ b/index.js
@@ -341,15 +341,11 @@ function showUnresponsiveDialog(win, details) {
case 1: //if relaunch - relaunch+exit
app.relaunch();
case 2:
- app.exit();
+ app.quit();
break;
case 0:
default:
return;
- //maybe set a timer and afterwards check responsivness and call function again if failed
}
});
}
-
-module.exports.aDialog = showUnresponsiveDialog;
-
From bb6ad14111608d3b085a50e1c4a0a6d77ce37252 Mon Sep 17 00:00:00 2001
From: Araxeus
Date: Thu, 15 Apr 2021 12:40:09 +0300
Subject: [PATCH 33/52] navbar background black fix visual bug
---
plugins/in-app-menu/style.css | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/plugins/in-app-menu/style.css b/plugins/in-app-menu/style.css
index 19dd59fb..c6339093 100644
--- a/plugins/in-app-menu/style.css
+++ b/plugins/in-app-menu/style.css
@@ -21,6 +21,16 @@ ytmusic-pivot-bar-item-renderer {
-webkit-app-region: unset !important;
}
+/* navbar background black */
+.center-content.ytmusic-nav-bar {
+ background: #030303;
+}
+
+/* move up item selectrion renderer by 15 px */
+ytmusic-item-section-renderer[has-item-section-tabbed-header-renderer_] #header.ytmusic-item-section-renderer {
+ top: 75 !important;
+}
+
/* fix weird positioning in search screen*/
ytmusic-header-renderer.ytmusic-search-page {
position: unset !important;
From ff6a486daf145c5a56ec5f500f29fdbf1c38391b Mon Sep 17 00:00:00 2001
From: Araxeus
Date: Thu, 15 Apr 2021 15:34:05 +0300
Subject: [PATCH 34/52] fix unresponsive dialog response
---
index.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/index.js b/index.js
index 13eaa2db..82ba695d 100644
--- a/index.js
+++ b/index.js
@@ -333,11 +333,11 @@ function showUnresponsiveDialog(win, details) {
type: "error",
title: "Window Unresponsive",
message: "The Application is Unresponsive",
- details: "We are sorry for the inconveniance! please choose what to do with the application:",
+ details: "We are sorry for the inconveniance! please choose what to do:",
buttons: ["Wait", "Relaunch", "Quit"],
cancelId: 0
- }).then( response => {
- switch (response) {
+ }).then( result => {
+ switch (result.response) {
case 1: //if relaunch - relaunch+exit
app.relaunch();
case 2:
@@ -345,7 +345,7 @@ function showUnresponsiveDialog(win, details) {
break;
case 0:
default:
- return;
+ break;
}
});
}
From 341a06aae70cf42b913ca73f5a0deb5b3afa3537 Mon Sep 17 00:00:00 2001
From: Araxeus
Date: Sat, 17 Apr 2021 20:30:06 +0300
Subject: [PATCH 35/52] add prompt with number counter
---
menu.js | 2 +-
package.json | 1 -
providers/prompt/dark-prompt.css | 5 ++
providers/prompt/index.js | 16 ++++-
providers/prompt/page/prompt.css | 32 +++++++++
providers/prompt/page/prompt.js | 114 +++++++++++++++++++++++--------
providers/prompt/readme.md | 5 +-
yarn.lock | 12 ----
8 files changed, 140 insertions(+), 47 deletions(-)
diff --git a/menu.js b/menu.js
index 90487970..588dad7c 100644
--- a/menu.js
+++ b/menu.js
@@ -335,7 +335,7 @@ function setProxy(item, win) {
});
}
prompt(options, win)
- .then((input) => {
+ .then(input => {
if (input !== null && input !== example) {
config.set("options.proxy", input);
item.checked = input !== "";
diff --git a/package.json b/package.json
index 144ac53f..a856babf 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,6 @@
"browser-id3-writer": "^4.4.0",
"custom-electron-titlebar": "^3.2.6",
"discord-rpc": "^3.2.0",
- "doc-ready": "^1.0.4",
"downloads-folder": "^3.0.1",
"electron-debug": "^3.2.0",
"electron-is": "^3.0.0",
diff --git a/providers/prompt/dark-prompt.css b/providers/prompt/dark-prompt.css
index 49e0f88e..74fea61e 100644
--- a/providers/prompt/dark-prompt.css
+++ b/providers/prompt/dark-prompt.css
@@ -45,3 +45,8 @@ body {
background-color: rgb(0, 0, 0);
color: whitesmoke;
}
+
+.minus,
+.plus {
+ background:rgb(0, 0, 0);
+}
\ No newline at end of file
diff --git a/providers/prompt/index.js b/providers/prompt/index.js
index bbba8b78..1c14cfa2 100644
--- a/providers/prompt/index.js
+++ b/providers/prompt/index.js
@@ -6,7 +6,9 @@ const url = require("url");
const path = require("path");
const DEFAULT_WIDTH = 370;
+const DEFAULT_COUNTER_WIDTH = 300;
const DEFAULT_HEIGHT = 160;
+const DEFAULT_COUNTER_HEIGHT= 150;
function electronPrompt(options, parentWindow) {
return new Promise((resolve, reject) => {
@@ -18,8 +20,6 @@ function electronPrompt(options, parentWindow) {
{
width: DEFAULT_WIDTH,
height: DEFAULT_HEIGHT,
- minWidth: DEFAULT_WIDTH,
- minHeight: DEFAULT_HEIGHT,
resizable: false,
title: "Prompt",
label: "Please input a value:",
@@ -40,6 +40,11 @@ function electronPrompt(options, parentWindow) {
options || {}
);
+ options_.minWidth = options.minWidth || options.width ||
+ options_.type === "counter" ? DEFAULT_COUNTER_WIDTH : DEFAULT_WIDTH;
+ options_.minHeight = options.minHeight || options.height ||
+ options_.type === "counter" ? DEFAULT_COUNTER_HEIGHT : DEFAULT_HEIGHT;
+
if (options_.type === "select" && (options_.selectOptions === null || typeof options_.selectOptions !== "object")) {
reject(new Error('"selectOptions" must be an object'));
return;
@@ -136,6 +141,13 @@ function electronPrompt(options, parentWindow) {
reject(new Error("prompt.html did-fail-load, log:\n", + log.toString()));
});
+ const promptUrl = url.format({
+ protocol: 'file',
+ slashes: true,
+ pathname: path.join(__dirname, 'page', 'prompt.html'),
+ hash: id
+ });
+
//Finally, load prompt
promptWindow.loadURL(promptUrl);
});
diff --git a/providers/prompt/page/prompt.css b/providers/prompt/page/prompt.css
index c3530e57..10654b8d 100644
--- a/providers/prompt/page/prompt.css
+++ b/providers/prompt/page/prompt.css
@@ -78,3 +78,35 @@ select#data {
background-color: #ddd;
color: black;
}
+
+/* Counter mode css */
+
+span {
+ cursor: pointer;
+}
+.number {
+ margin: 100px;
+}
+.minus,
+.plus {
+ user-select: none;
+ width: 20px;
+ height: 20px;
+ background: #f2f2f2;
+ border-radius: 4px;
+ padding: 8px 5px 8px 5px;
+ border: 1px solid #ddd;
+ display: inline-block;
+ vertical-align: middle;
+ text-align: center;
+}
+.inputt {
+ height: 34px;
+ width: 100px;
+ text-align: center;
+ font-size: 26px;
+ border: 1px solid #ddd;
+ border-radius: 4px;
+ display: inline-block;
+ vertical-align: middle;
+}
diff --git a/providers/prompt/page/prompt.js b/providers/prompt/page/prompt.js
index b7a54120..042ba546 100644
--- a/providers/prompt/page/prompt.js
+++ b/providers/prompt/page/prompt.js
@@ -1,13 +1,13 @@
const fs = require("fs");
const {ipcRenderer} = require("electron");
-const docReady = require("doc-ready");
let promptId = null;
let promptOptions = null;
+function $(selector) {return document.querySelector(selector)}
+
+document.addEventListener( 'DOMContentLoaded', promptRegister);
-docReady(promptRegister);
-//start here
function promptRegister() {
//get custom session id
promptId = document.location.hash.replace("#", "");
@@ -21,18 +21,18 @@ function promptRegister() {
//set label
if (promptOptions.useHtmlLabel) {
- document.querySelector("#label").innerHTML = promptOptions.label;
+ $("#label").innerHTML = promptOptions.label;
} else {
- document.querySelector("#label").textContent = promptOptions.label;
+ $("#label").textContent = promptOptions.label;
}
//set button label
if (promptOptions.buttonLabels && promptOptions.buttonLabels.ok) {
- document.querySelector("#ok").textContent = promptOptions.buttonLabels.ok;
+ $("#ok").textContent = promptOptions.buttonLabels.ok;
}
if (promptOptions.buttonLabels && promptOptions.buttonLabels.cancel) {
- document.querySelector("#cancel").textContent = promptOptions.buttonLabels.cancel;
+ $("#cancel").textContent = promptOptions.buttonLabels.cancel;
}
//inject custom stylesheet from options
@@ -51,26 +51,40 @@ function promptRegister() {
}
//add button listeners
- document.querySelector("#form").addEventListener("submit", promptSubmit);
- document.querySelector("#cancel").addEventListener("click", promptCancel);
+ $("#form").addEventListener("submit", promptSubmit);
+ $("#cancel").addEventListener("click", promptCancel);
//create input/select
- const dataContainerElement = document.querySelector("#data-container");
+ const dataContainerElement = $("#data-container");
let dataElement;
- if (promptOptions.type === "input") {
- dataElement = promptCreateInput();
- } else if (promptOptions.type === "select") {
- dataElement = promptCreateSelect();
- } else {
- return promptError(`Unhandled input type '${promptOptions.type}'`);
- }
- dataContainerElement.append(dataElement);
+ switch (promptOptions.type) {
+ case "counter":
+ case "input":
+ dataElement = promptCreateInput();
+ break;
+ case "select":
+ dataElement = promptCreateSelect();
+ break;
+ default:
+ return promptError(`Unhandled input type '${promptOptions.type}'`);
+ }
+ if (promptOptions.type === "counter") {
+ dataElement.classList.add("input");
+ dataElement.style.width = "unset";
+ dataElement.style["text-align"] = "center";
+ //dataElement.style["min-height"] = "1.5em";
+ dataContainerElement.append(createMinus(dataElement));
+ dataContainerElement.append(dataElement);
+ dataContainerElement.append(createPlus(dataElement));
+ } else {
+ dataContainerElement.append(dataElement);
+ }
dataElement.setAttribute("id", "data");
dataElement.focus();
- if (promptOptions.type === "input") {
+ if (promptOptions.type === "input" || promptOptions.type === "counter") {
dataElement.select();
}
@@ -87,7 +101,8 @@ function promptRegister() {
window.addEventListener("error", error => {
if (promptId) {
- promptError("An error has occured on the prompt window: \n" + error);
+ promptError("An error has occured on the prompt window: \n" + JSON.stringify(error, ["message", "arguments", "type", "name"])
+ );
}
});
@@ -107,15 +122,23 @@ function promptCancel() {
//transfer input data to back
function promptSubmit() {
- const dataElement = document.querySelector("#data");
+ const dataElement = $("#data");
let data = null;
- if (promptOptions.type === "input") {
- data = dataElement.value;
- } else if (promptOptions.type === "select") {
- data = promptOptions.selectMultiple ?
- dataElement.querySelectorAll("option[selected]").map(o => o.getAttribute("value")) :
- dataElement.value;
+ switch (promptOptions.type) {
+ case "input":
+ data = dataElement.value;
+ break;
+ case "counter":
+ data = validateCounterInput(dataElement.value);
+ break;
+ case "select":
+ data = promptOptions.selectMultiple ?
+ dataElement.querySelectorAll("option[selected]").map(o => o.getAttribute("value")) :
+ dataElement.value;
+ break;
+ default: //will never happen
+ return promptError(`Unhandled input type '${promptOptions.type}'`);
}
ipcRenderer.sendSync("prompt-post-data:" + promptId, data);
@@ -127,6 +150,9 @@ function promptCreateInput() {
dataElement.setAttribute("type", "text");
if (promptOptions.value) {
+ if (promptOptions.type === "counter") {
+ promptOptions.value = validateCounterInput(promptOptions.value);
+ }
dataElement.value = promptOptions.value;
} else {
dataElement.value = "";
@@ -150,11 +176,11 @@ function promptCreateInput() {
}
});
- //Confrim on 'Enter'
+ //Confirm on 'Enter'
dataElement.addEventListener("keypress", event => {
if (event.key === "Enter") {
event.preventDefault();
- document.querySelector("#ok").click();
+ $("#ok").click();
}
});
@@ -184,5 +210,35 @@ function promptCreateSelect() {
return dataElement;
}
+function createMinus(dataElement) {
+ const minus = document.createElement("span");
+ minus.textContent = "-";
+ minus.classList.add("minus");
+ minus.onmousedown = () => {
+ dataElement.value = validateCounterInput(parseInt(dataElement.value) - 1);
+ };
+ return minus;
+}
+function createPlus(dataElement) {
+ const plus = document.createElement("span");
+ plus.textContent = "+";
+ plus.classList.add("plus");
+ plus.onmousedown = () => {
+ dataElement.value = validateCounterInput(parseInt(dataElement.value) + 1);
+ };
+ return plus;
+}
+//validate counter
+function validateCounterInput(input) {
+ const min = promptOptions.counterOptions?.minimum,
+ max = promptOptions.counterOptions?.maximum;
+ if (min !== undefined && input < min) {
+ return min;
+ }
+ if (max !== undefined && input > max) {
+ return max;
+ }
+ return input;
+}
diff --git a/providers/prompt/readme.md b/providers/prompt/readme.md
index 6683aced..eff1f907 100644
--- a/providers/prompt/readme.md
+++ b/providers/prompt/readme.md
@@ -43,8 +43,9 @@ prompt({
| label | (optional, string) The label which appears on the prompt for the input field. Defaults to 'Please input a value:'. |
| buttonLabels | (optional, object) The text for the OK/cancel buttons. Properties are 'ok' and 'cancel'. Defaults to null. |
| value | (optional, string) The default value for the input field. Defaults to null. |
-| type | (optional, string) The type of input field, either 'input' for a standard text input field or 'select' for a dropdown type input. Defaults to 'input'. |
-| inputAttrs | (optional, object) The attributes of the input field, analagous to the HTML attributes: `{type: 'text', required: true}` -> ``. Used if the type is 'input' |
+| type | (optional, string) The type of input field, either 'input' for a standard text input field or 'select' for a dropdown type input or 'counter' for a number counter with buttons. Defaults to 'input'. |
+| inputAttrs | (optional, object) The attributes of the input field, analagous to the HTML attributes: `{type: 'text', required: true}` -> ``. Used if the type is 'input'
+| counterOptions | (optional, object) minimum and maximum of counter in format: `{minimum: %int%, maximum: %int%} ` |
| selectOptions | (optional, object) The items for the select dropdown if using the 'select' type in the format 'value': 'display text', where the value is what will be given to the then block and the display text is what the user will see. |
| useHtmlLabel | (optional, boolean) Whether the label should be interpreted as HTML or not. Defaults to false. |
| width | (optional, integer) The width of the prompt window. Defaults to 370. |
diff --git a/yarn.lock b/yarn.lock
index f9909214..c969527e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2908,13 +2908,6 @@ dmg-builder@22.9.1:
js-yaml "^3.14.0"
sanitize-filename "^1.6.3"
-doc-ready@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/doc-ready/-/doc-ready-1.0.4.tgz#37f5391969cff994303fdfef2e5d50357f8164d3"
- integrity sha1-N/U5GWnP+ZQwP9/vLl1QNX+BZNM=
- dependencies:
- eventie "^1"
-
doctrine@1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
@@ -3612,11 +3605,6 @@ esutils@^2.0.2:
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-eventie@^1:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/eventie/-/eventie-1.0.6.tgz#d4ffc8b0c2b5e493c2aa1b22cbe918d3aee74437"
- integrity sha1-1P/IsMK15JPCqhsiy+kY067nRDc=
-
events@^3.0.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
From 3f50ab7cfc8c0efcacd35848baf2cf499f8f4706 Mon Sep 17 00:00:00 2001
From: Araxeus
Date: Sat, 17 Apr 2021 20:43:48 +0300
Subject: [PATCH 36/52] lint
---
providers/prompt/dark-prompt.css | 4 ++--
providers/prompt/page/prompt.css | 14 --------------
providers/prompt/page/prompt.js | 11 +++++------
3 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/providers/prompt/dark-prompt.css b/providers/prompt/dark-prompt.css
index 74fea61e..8bf39791 100644
--- a/providers/prompt/dark-prompt.css
+++ b/providers/prompt/dark-prompt.css
@@ -48,5 +48,5 @@ body {
.minus,
.plus {
- background:rgb(0, 0, 0);
-}
\ No newline at end of file
+ background: rgb(0, 0, 0);
+}
diff --git a/providers/prompt/page/prompt.css b/providers/prompt/page/prompt.css
index 10654b8d..3224cf6a 100644
--- a/providers/prompt/page/prompt.css
+++ b/providers/prompt/page/prompt.css
@@ -80,13 +80,9 @@ select#data {
}
/* Counter mode css */
-
span {
cursor: pointer;
}
-.number {
- margin: 100px;
-}
.minus,
.plus {
user-select: none;
@@ -100,13 +96,3 @@ span {
vertical-align: middle;
text-align: center;
}
-.inputt {
- height: 34px;
- width: 100px;
- text-align: center;
- font-size: 26px;
- border: 1px solid #ddd;
- border-radius: 4px;
- display: inline-block;
- vertical-align: middle;
-}
diff --git a/providers/prompt/page/prompt.js b/providers/prompt/page/prompt.js
index 042ba546..d3abfeab 100644
--- a/providers/prompt/page/prompt.js
+++ b/providers/prompt/page/prompt.js
@@ -1,12 +1,12 @@
const fs = require("fs");
-const {ipcRenderer} = require("electron");
+const { ipcRenderer } = require("electron");
let promptId = null;
let promptOptions = null;
-function $(selector) {return document.querySelector(selector)}
+function $(selector) { return document.querySelector(selector) }
-document.addEventListener( 'DOMContentLoaded', promptRegister);
+document.addEventListener('DOMContentLoaded', promptRegister);
function promptRegister() {
//get custom session id
@@ -71,7 +71,6 @@ function promptRegister() {
return promptError(`Unhandled input type '${promptOptions.type}'`);
}
if (promptOptions.type === "counter") {
- dataElement.classList.add("input");
dataElement.style.width = "unset";
dataElement.style["text-align"] = "center";
//dataElement.style["min-height"] = "1.5em";
@@ -215,7 +214,7 @@ function createMinus(dataElement) {
minus.textContent = "-";
minus.classList.add("minus");
minus.onmousedown = () => {
- dataElement.value = validateCounterInput(parseInt(dataElement.value) - 1);
+ dataElement.value = validateCounterInput(parseInt(dataElement.value) - 1);
};
return minus;
}
@@ -233,7 +232,7 @@ function createPlus(dataElement) {
//validate counter
function validateCounterInput(input) {
const min = promptOptions.counterOptions?.minimum,
- max = promptOptions.counterOptions?.maximum;
+ max = promptOptions.counterOptions?.maximum;
if (min !== undefined && input < min) {
return min;
}
From 97a9e632317c674bae580f818d474fd21487698d Mon Sep 17 00:00:00 2001
From: Araxeus
Date: Sat, 17 Apr 2021 21:17:07 +0300
Subject: [PATCH 37/52] xo --fix
---
preload.js | 2 +-
providers/{frontLogger.js => front-logger.js} | 0
providers/prompt/index.js | 16 +++---
providers/prompt/page/prompt.js | 51 +++++++++++--------
4 files changed, 38 insertions(+), 31 deletions(-)
rename providers/{frontLogger.js => front-logger.js} (100%)
diff --git a/preload.js b/preload.js
index 5fcb2e07..74860cec 100644
--- a/preload.js
+++ b/preload.js
@@ -34,7 +34,7 @@ document.addEventListener("DOMContentLoaded", () => {
fileExists(songInfoProviderPath, require(songInfoProviderPath));
// inject front logger
- const loggerPath = path.join(__dirname, "providers", "frontLogger.js")
+ const loggerPath = path.join(__dirname, "providers", "front-logger.js")
fileExists(loggerPath, require(loggerPath));
// Add action for reloading
diff --git a/providers/frontLogger.js b/providers/front-logger.js
similarity index 100%
rename from providers/frontLogger.js
rename to providers/front-logger.js
diff --git a/providers/prompt/index.js b/providers/prompt/index.js
index 1c14cfa2..1e29766f 100644
--- a/providers/prompt/index.js
+++ b/providers/prompt/index.js
@@ -8,7 +8,7 @@ const path = require("path");
const DEFAULT_WIDTH = 370;
const DEFAULT_COUNTER_WIDTH = 300;
const DEFAULT_HEIGHT = 160;
-const DEFAULT_COUNTER_HEIGHT= 150;
+const DEFAULT_COUNTER_HEIGHT = 150;
function electronPrompt(options, parentWindow) {
return new Promise((resolve, reject) => {
@@ -40,9 +40,9 @@ function electronPrompt(options, parentWindow) {
options || {}
);
- options_.minWidth = options.minWidth || options.width ||
+ options_.minWidth = options.minWidth || options.width ||
options_.type === "counter" ? DEFAULT_COUNTER_WIDTH : DEFAULT_WIDTH;
- options_.minHeight = options.minHeight || options.height ||
+ options_.minHeight = options.minHeight || options.height ||
options_.type === "counter" ? DEFAULT_COUNTER_HEIGHT : DEFAULT_HEIGHT;
if (options_.type === "select" && (options_.selectOptions === null || typeof options_.selectOptions !== "object")) {
@@ -130,21 +130,21 @@ function electronPrompt(options, parentWindow) {
event,
errorCode,
errorDescription,
- validatedURL,
+ validatedURL
) => {
const log = {
error: "did-fail-load",
errorCode,
errorDescription,
- validatedURL,
+ validatedURL
};
- reject(new Error("prompt.html did-fail-load, log:\n", + log.toString()));
+ reject(new Error("prompt.html did-fail-load, log:\n" + log.toString()));
});
const promptUrl = url.format({
- protocol: 'file',
+ protocol: "file",
slashes: true,
- pathname: path.join(__dirname, 'page', 'prompt.html'),
+ pathname: path.join(__dirname, "page", "prompt.html"),
hash: id
});
diff --git a/providers/prompt/page/prompt.js b/providers/prompt/page/prompt.js
index d3abfeab..ac79f106 100644
--- a/providers/prompt/page/prompt.js
+++ b/providers/prompt/page/prompt.js
@@ -4,9 +4,11 @@ const { ipcRenderer } = require("electron");
let promptId = null;
let promptOptions = null;
-function $(selector) { return document.querySelector(selector) }
+function $(selector) {
+ return document.querySelector(selector);
+}
-document.addEventListener('DOMContentLoaded', promptRegister);
+document.addEventListener("DOMContentLoaded", promptRegister);
function promptRegister() {
//get custom session id
@@ -54,7 +56,6 @@ function promptRegister() {
$("#form").addEventListener("submit", promptSubmit);
$("#cancel").addEventListener("click", promptCancel);
-
//create input/select
const dataContainerElement = $("#data-container");
let dataElement;
@@ -70,19 +71,20 @@ function promptRegister() {
default:
return promptError(`Unhandled input type '${promptOptions.type}'`);
}
+
if (promptOptions.type === "counter") {
dataElement.style.width = "unset";
dataElement.style["text-align"] = "center";
- //dataElement.style["min-height"] = "1.5em";
- dataContainerElement.append(createMinus(dataElement));
+ dataContainerElement.append(createMinusButton(dataElement));
dataContainerElement.append(dataElement);
- dataContainerElement.append(createPlus(dataElement));
+ dataContainerElement.append(createPlusButton(dataElement));
} else {
dataContainerElement.append(dataElement);
}
- dataElement.setAttribute("id", "data");
+ dataElement.setAttribute("id", "data");
dataElement.focus();
+
if (promptOptions.type === "input" || promptOptions.type === "counter") {
dataElement.select();
}
@@ -100,7 +102,8 @@ function promptRegister() {
window.addEventListener("error", error => {
if (promptId) {
- promptError("An error has occured on the prompt window: \n" + JSON.stringify(error, ["message", "arguments", "type", "name"])
+ promptError("An error has occured on the prompt window: \n" +
+ JSON.stringify(error, ["message", "arguments", "type", "name"])
);
}
});
@@ -209,35 +212,39 @@ function promptCreateSelect() {
return dataElement;
}
-function createMinus(dataElement) {
- const minus = document.createElement("span");
- minus.textContent = "-";
- minus.classList.add("minus");
- minus.onmousedown = () => {
+function createMinusButton(dataElement) {
+ const minusBtn = document.createElement("span");
+ minusBtn.textContent = "-";
+ minusBtn.classList.add("minus");
+ minusBtn.onmousedown = () => {
dataElement.value = validateCounterInput(parseInt(dataElement.value) - 1);
};
- return minus;
+ return minusBtn;
}
-function createPlus(dataElement) {
- const plus = document.createElement("span");
- plus.textContent = "+";
- plus.classList.add("plus");
- plus.onmousedown = () => {
+function createPlusButton(dataElement) {
+ const plusBtn = document.createElement("span");
+ plusBtn.textContent = "+";
+ plusBtn.classList.add("plus");
+ plusBtn.onmousedown = () => {
dataElement.value = validateCounterInput(parseInt(dataElement.value) + 1);
};
- return plus;
+
+ return plusBtn;
}
//validate counter
function validateCounterInput(input) {
- const min = promptOptions.counterOptions?.minimum,
- max = promptOptions.counterOptions?.maximum;
+ const min = promptOptions.counterOptions?.minimum;
+ const max = promptOptions.counterOptions?.maximum;
+
if (min !== undefined && input < min) {
return min;
}
+
if (max !== undefined && input > max) {
return max;
}
+
return input;
}
From b7b1316e7095565eb0c6370f46dc1fee972df61e Mon Sep 17 00:00:00 2001
From: Araxeus
Date: Sat, 17 Apr 2021 22:55:25 +0300
Subject: [PATCH 38/52] add rapidFire option to counter prompt
---
providers/prompt/index.js | 16 +++++---
providers/prompt/page/prompt.js | 69 +++++++++++++++++++++++++++------
providers/prompt/readme.md | 2 +-
3 files changed, 69 insertions(+), 18 deletions(-)
diff --git a/providers/prompt/index.js b/providers/prompt/index.js
index 1e29766f..009c8c7a 100644
--- a/providers/prompt/index.js
+++ b/providers/prompt/index.js
@@ -18,8 +18,8 @@ function electronPrompt(options, parentWindow) {
//custom options override default
const options_ = Object.assign(
{
- width: DEFAULT_WIDTH,
- height: DEFAULT_HEIGHT,
+ width: options?.type === "counter" ? DEFAULT_COUNTER_WIDTH : DEFAULT_WIDTH,
+ height:options?.type === "counter" ? DEFAULT_COUNTER_HEIGHT: DEFAULT_HEIGHT,
resizable: false,
title: "Prompt",
label: "Please input a value:",
@@ -28,6 +28,7 @@ function electronPrompt(options, parentWindow) {
value: null,
type: "input",
selectOptions: null,
+ counterOptions: {minimum: null, maximum: null, multiFire: false},
icon: null,
useHtmlLabel: false,
customStylesheet: null,
@@ -40,10 +41,13 @@ function electronPrompt(options, parentWindow) {
options || {}
);
- options_.minWidth = options.minWidth || options.width ||
- options_.type === "counter" ? DEFAULT_COUNTER_WIDTH : DEFAULT_WIDTH;
- options_.minHeight = options.minHeight || options.height ||
- options_.type === "counter" ? DEFAULT_COUNTER_HEIGHT : DEFAULT_HEIGHT;
+ options_.minWidth = options?.minWidth || options?.width || options_.width;
+ options_.minHeight = options?.minHeight || options?.height || options_.height;
+
+ if (options_.type === "counter" && (options_.counterOptions !== null && typeof options_.selectOptions !== "object")) {
+ reject(new Error('"counterOptions" must be an object if specified'));
+ return;
+ }
if (options_.type === "select" && (options_.selectOptions === null || typeof options_.selectOptions !== "object")) {
reject(new Error('"selectOptions" must be an object'));
diff --git a/providers/prompt/page/prompt.js b/providers/prompt/page/prompt.js
index ac79f106..3cad04ac 100644
--- a/providers/prompt/page/prompt.js
+++ b/providers/prompt/page/prompt.js
@@ -4,7 +4,7 @@ const { ipcRenderer } = require("electron");
let promptId = null;
let promptOptions = null;
-function $(selector) {
+function $(selector) {
return document.querySelector(selector);
}
@@ -62,6 +62,8 @@ function promptRegister() {
switch (promptOptions.type) {
case "counter":
+ dataElement = promptCreateCounter();
+ break;
case "input":
dataElement = promptCreateInput();
break;
@@ -73,8 +75,6 @@ function promptRegister() {
}
if (promptOptions.type === "counter") {
- dataElement.style.width = "unset";
- dataElement.style["text-align"] = "center";
dataContainerElement.append(createMinusButton(dataElement));
dataContainerElement.append(dataElement);
dataContainerElement.append(createPlusButton(dataElement));
@@ -212,27 +212,74 @@ function promptCreateSelect() {
return dataElement;
}
+let pressed = false;
+function multiFire(timer, scaleSpeed, callback, ...args) {
+ if (!pressed) {
+ return;
+ }
+ if (timer > scaleSpeed) {
+ timer -= scaleSpeed;
+ }
+ callback(...args);
+ setTimeout(multiFire, timer, timer, scaleSpeed, callback, ...args)
+}
+
function createMinusButton(dataElement) {
+ function doMinus() {
+ dataElement.value = validateCounterInput(parseInt(dataElement.value) - 1);
+ }
const minusBtn = document.createElement("span");
minusBtn.textContent = "-";
minusBtn.classList.add("minus");
- minusBtn.onmousedown = () => {
- dataElement.value = validateCounterInput(parseInt(dataElement.value) - 1);
- };
+ if (promptOptions.counterOptions?.multiFire) {
+ minusBtn.onmousedown = () => {
+ pressed = true;
+ multiFire(500, 100, doMinus);
+ };
+
+ } else {
+ minusBtn.onmousedown = () => {
+ doMinus();
+ };
+ }
return minusBtn;
}
function createPlusButton(dataElement) {
+ function doPlus() {
+ dataElement.value = validateCounterInput(parseInt(dataElement.value) + 1);
+ }
const plusBtn = document.createElement("span");
plusBtn.textContent = "+";
plusBtn.classList.add("plus");
- plusBtn.onmousedown = () => {
- dataElement.value = validateCounterInput(parseInt(dataElement.value) + 1);
- };
-
+ if (promptOptions.counterOptions?.multiFire) {
+ plusBtn.onmousedown = () => {
+ pressed = true;
+ multiFire(500, 100, doPlus);
+ };
+ } else {
+ plusBtn.onmousedown = () => {
+ doPlus();
+ };
+ }
return plusBtn;
}
+function promptCreateCounter() {
+ if (promptOptions.counterOptions?.multiFire) {
+ document.onmouseup = () => {
+ pressed = false;
+ };
+ }
+
+ const dataElement = promptCreateInput();
+
+ dataElement.style.width = "unset";
+ dataElement.style["text-align"] = "center";
+
+ return dataElement;
+}
+
//validate counter
function validateCounterInput(input) {
const min = promptOptions.counterOptions?.minimum;
@@ -245,6 +292,6 @@ function validateCounterInput(input) {
if (max !== undefined && input > max) {
return max;
}
-
+
return input;
}
diff --git a/providers/prompt/readme.md b/providers/prompt/readme.md
index eff1f907..ec272375 100644
--- a/providers/prompt/readme.md
+++ b/providers/prompt/readme.md
@@ -45,7 +45,7 @@ prompt({
| value | (optional, string) The default value for the input field. Defaults to null. |
| type | (optional, string) The type of input field, either 'input' for a standard text input field or 'select' for a dropdown type input or 'counter' for a number counter with buttons. Defaults to 'input'. |
| inputAttrs | (optional, object) The attributes of the input field, analagous to the HTML attributes: `{type: 'text', required: true}` -> ``. Used if the type is 'input'
-| counterOptions | (optional, object) minimum and maximum of counter in format: `{minimum: %int%, maximum: %int%} ` |
+| counterOptions | (optional, object) minimum and maximum of counter, and if continuous input is enabled. format: `{minimum: %int%, maximum: %int%, multiFire: %boolean%`. min+max values defaults to null and multiFire defaults to false. |
| selectOptions | (optional, object) The items for the select dropdown if using the 'select' type in the format 'value': 'display text', where the value is what will be given to the then block and the display text is what the user will see. |
| useHtmlLabel | (optional, boolean) Whether the label should be interpreted as HTML or not. Defaults to false. |
| width | (optional, integer) The width of the prompt window. Defaults to 370. |
From 00468c7d0ec1db09786ae3385fc3a0413226e40a Mon Sep 17 00:00:00 2001
From: Araxeus
Date: Sun, 18 Apr 2021 00:44:22 +0300
Subject: [PATCH 39/52] use timeout ID to stop callback
---
providers/prompt/page/prompt.js | 73 ++++++++++++++++++++++++---------
1 file changed, 53 insertions(+), 20 deletions(-)
diff --git a/providers/prompt/page/prompt.js b/providers/prompt/page/prompt.js
index 3cad04ac..b4759e2d 100644
--- a/providers/prompt/page/prompt.js
+++ b/providers/prompt/page/prompt.js
@@ -212,29 +212,60 @@ function promptCreateSelect() {
return dataElement;
}
-let pressed = false;
-function multiFire(timer, scaleSpeed, callback, ...args) {
- if (!pressed) {
- return;
+let nextTimeoutID = null;
+
+/* Function execute callback in 3 accelerated intervals based on timer.
+ * Terminated from document.onmouseup() that is registered from promptCreateCounter()
+ * @param {function} callback: function to execute
+ * @param {object} timer: {
+ * * time: First delay in miliseconds.
+ * * limit: First Speed Limit, gets divided by 2 after $20 calls. $number change exponentially
+ * * scaleSpeed: Speed change per tick on first acceleration
+ * }
+ * @param {int} stepArgs: argument for callback representing Initial steps per click, default to 1
+ * steps starts to increase when speed is too fast to notice
+ * @param {int} counter: used internally to decrease timer.limit
+ */
+function multiFire(callback, timer = { time: 500, scaleSpeed: 140, limit: 100 }, stepsArg = 1, counter = 0) {
+ callback(stepsArg);
+
+ const nextTimeout = timer.time
+
+ if (counter > 20) {
+ counter = 0 - stepsArg;
+ if (timer.limit > 1) {
+ timer.limit = timer.limit / 2;
+ } else {
+ stepsArg *= 2;
+ }
}
- if (timer > scaleSpeed) {
- timer -= scaleSpeed;
+ if (timer.time != timer.limit) {
+ timer.time = timer.time > timer.limit ?
+ timer.time - timer.scaleSpeed :
+ timer.limit;
}
- callback(...args);
- setTimeout(multiFire, timer, timer, scaleSpeed, callback, ...args)
+
+ nextTimeoutID = setTimeout(
+ multiFire, //callback
+ nextTimeout, //timer
+ //multiFire args:
+ callback,
+ timer,
+ stepsArg,
+ counter + 1
+ )
}
function createMinusButton(dataElement) {
- function doMinus() {
- dataElement.value = validateCounterInput(parseInt(dataElement.value) - 1);
+ function doMinus(steps) {
+ dataElement.value = validateCounterInput(parseInt(dataElement.value) - steps);
}
const minusBtn = document.createElement("span");
minusBtn.textContent = "-";
minusBtn.classList.add("minus");
if (promptOptions.counterOptions?.multiFire) {
minusBtn.onmousedown = () => {
- pressed = true;
- multiFire(500, 100, doMinus);
+ multiFire(doMinus);
};
} else {
@@ -246,16 +277,15 @@ function createMinusButton(dataElement) {
}
function createPlusButton(dataElement) {
- function doPlus() {
- dataElement.value = validateCounterInput(parseInt(dataElement.value) + 1);
+ function doPlus(steps) {
+ dataElement.value = validateCounterInput(parseInt(dataElement.value) + steps);
}
const plusBtn = document.createElement("span");
plusBtn.textContent = "+";
plusBtn.classList.add("plus");
if (promptOptions.counterOptions?.multiFire) {
plusBtn.onmousedown = () => {
- pressed = true;
- multiFire(500, 100, doPlus);
+ multiFire(doPlus);
};
} else {
plusBtn.onmousedown = () => {
@@ -268,7 +298,10 @@ function createPlusButton(dataElement) {
function promptCreateCounter() {
if (promptOptions.counterOptions?.multiFire) {
document.onmouseup = () => {
- pressed = false;
+ if (!!nextTimeoutID) {
+ clearTimeout(nextTimeoutID)
+ nextTimeoutID = null;
+ }
};
}
@@ -284,12 +317,12 @@ function promptCreateCounter() {
function validateCounterInput(input) {
const min = promptOptions.counterOptions?.minimum;
const max = promptOptions.counterOptions?.maximum;
-
- if (min !== undefined && input < min) {
+ //note that !min/max would proc if min/max are 0
+ if (min !== null && min !== undefined && input < min) {
return min;
}
- if (max !== undefined && input > max) {
+ if (max !== null && max !== undefined && input > max) {
return max;
}
From 72716afcd3fcba96714c360257d95cb77af125a8 Mon Sep 17 00:00:00 2001
From: Araxeus
Date: Sun, 18 Apr 2021 01:44:18 +0300
Subject: [PATCH 40/52] lint
---
menu.js | 6 +++---
providers/prompt/index.js | 8 ++++++--
providers/prompt/page/prompt.js | 18 ++++++++++++------
providers/prompt/readme.md | 6 +++---
4 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/menu.js b/menu.js
index 588dad7c..dddce721 100644
--- a/menu.js
+++ b/menu.js
@@ -149,7 +149,7 @@ const mainMenuTemplate = (win) => [
type: "checkbox",
checked: !!config.get("options.proxy"),
click: (item) => {
- setProxy(item, win);
+ setProxy(item, win);
}
},
{
@@ -322,10 +322,10 @@ function setProxy(item, win) {
},
type: 'input',
icon: iconPath,
- customStylesheet: path.join(__dirname, "providers", "prompt", "dark-prompt.css"),
+ customStylesheet: "dark",
};
//TODO: custom bar on prompt need testing on macOS
- if(!is.macOS()) {
+ if (!is.macOS()) {
Object.assign(options, {
frame: false,
customScript: path.join(__dirname, "providers", "prompt", "custom-titlebar.js"),
diff --git a/providers/prompt/index.js b/providers/prompt/index.js
index 009c8c7a..95babc9c 100644
--- a/providers/prompt/index.js
+++ b/providers/prompt/index.js
@@ -19,7 +19,7 @@ function electronPrompt(options, parentWindow) {
const options_ = Object.assign(
{
width: options?.type === "counter" ? DEFAULT_COUNTER_WIDTH : DEFAULT_WIDTH,
- height:options?.type === "counter" ? DEFAULT_COUNTER_HEIGHT: DEFAULT_HEIGHT,
+ height: options?.type === "counter" ? DEFAULT_COUNTER_HEIGHT : DEFAULT_HEIGHT,
resizable: false,
title: "Prompt",
label: "Please input a value:",
@@ -28,7 +28,7 @@ function electronPrompt(options, parentWindow) {
value: null,
type: "input",
selectOptions: null,
- counterOptions: {minimum: null, maximum: null, multiFire: false},
+ counterOptions: { minimum: null, maximum: null, multiFire: false },
icon: null,
useHtmlLabel: false,
customStylesheet: null,
@@ -44,6 +44,10 @@ function electronPrompt(options, parentWindow) {
options_.minWidth = options?.minWidth || options?.width || options_.width;
options_.minHeight = options?.minHeight || options?.height || options_.height;
+ if (options_.customStylesheet === "dark") {
+ options_.customStylesheet = require("path").join(__dirname, "dark-prompt.css");
+ }
+
if (options_.type === "counter" && (options_.counterOptions !== null && typeof options_.selectOptions !== "object")) {
reject(new Error('"counterOptions" must be an object if specified'));
return;
diff --git a/providers/prompt/page/prompt.js b/providers/prompt/page/prompt.js
index b4759e2d..7f609b52 100644
--- a/providers/prompt/page/prompt.js
+++ b/providers/prompt/page/prompt.js
@@ -229,17 +229,18 @@ let nextTimeoutID = null;
function multiFire(callback, timer = { time: 500, scaleSpeed: 140, limit: 100 }, stepsArg = 1, counter = 0) {
callback(stepsArg);
- const nextTimeout = timer.time
+ const nextTimeout = timer.time;
if (counter > 20) {
counter = 0 - stepsArg;
if (timer.limit > 1) {
- timer.limit = timer.limit / 2;
+ timer.limit /= 2;
} else {
stepsArg *= 2;
}
}
- if (timer.time != timer.limit) {
+
+ if (timer.time !== timer.limit) {
timer.time = timer.time > timer.limit ?
timer.time - timer.scaleSpeed :
timer.limit;
@@ -253,26 +254,28 @@ function multiFire(callback, timer = { time: 500, scaleSpeed: 140, limit: 100 },
timer,
stepsArg,
counter + 1
- )
+ );
}
function createMinusButton(dataElement) {
function doMinus(steps) {
dataElement.value = validateCounterInput(parseInt(dataElement.value) - steps);
}
+
const minusBtn = document.createElement("span");
minusBtn.textContent = "-";
minusBtn.classList.add("minus");
+
if (promptOptions.counterOptions?.multiFire) {
minusBtn.onmousedown = () => {
multiFire(doMinus);
};
-
} else {
minusBtn.onmousedown = () => {
doMinus();
};
}
+
return minusBtn;
}
@@ -280,9 +283,11 @@ function createPlusButton(dataElement) {
function doPlus(steps) {
dataElement.value = validateCounterInput(parseInt(dataElement.value) + steps);
}
+
const plusBtn = document.createElement("span");
plusBtn.textContent = "+";
plusBtn.classList.add("plus");
+
if (promptOptions.counterOptions?.multiFire) {
plusBtn.onmousedown = () => {
multiFire(doPlus);
@@ -292,13 +297,14 @@ function createPlusButton(dataElement) {
doPlus();
};
}
+
return plusBtn;
}
function promptCreateCounter() {
if (promptOptions.counterOptions?.multiFire) {
document.onmouseup = () => {
- if (!!nextTimeoutID) {
+ if (nextTimeoutID) {
clearTimeout(nextTimeoutID)
nextTimeoutID = null;
}
diff --git a/providers/prompt/readme.md b/providers/prompt/readme.md
index ec272375..a3775b8d 100644
--- a/providers/prompt/readme.md
+++ b/providers/prompt/readme.md
@@ -1,6 +1,6 @@
# Prompt Documentation
-
+
Simplest Prompt:
## Usage
```js
@@ -49,13 +49,13 @@ prompt({
| selectOptions | (optional, object) The items for the select dropdown if using the 'select' type in the format 'value': 'display text', where the value is what will be given to the then block and the display text is what the user will see. |
| useHtmlLabel | (optional, boolean) Whether the label should be interpreted as HTML or not. Defaults to false. |
| width | (optional, integer) The width of the prompt window. Defaults to 370. |
-| minWidth | (optional, integer) The minimum allowed width for the prompt window. Same default value as width. |
+| minWidth | (optional, integer) The minimum allowed width for the prompt window. Default to width if specified or default_width(370). | |
| height | (optional, integer) The height of the prompt window. Defaults to 130. |
| minHeight | (optional, integer) The minimum allowed height for the prompt window. Same default value as height. |
| resizable | (optional, boolean) Whether the prompt window can be resized or not (also sets useContentSize). Defaults to false. |
| alwaysOnTop | (optional, boolean) Whether the window should always stay on top of other windows. Defaults to false |
| icon | (optional, string) The path to an icon image to use in the title bar. Defaults to null and uses electron's icon. |
-| customStylesheet | (optional, string) The local path of a CSS file to stylize the prompt window. Defaults to null. |
+| customStylesheet | (optional, string) The local path of a CSS file to customize the style of the prompt window, you can use just "dark" to use the premade dark skin. Defaults to null. |
| menuBarVisible | (optional, boolean) Whether to show the menubar or not. Defaults to false. |
| skipTaskbar | (optional, boolean) Whether to show the prompt window icon in taskbar. Defaults to true. |
| frame | (optional, boolean) Wether to create prompt with frame. Defaults to true. |
From a1940461688bb3ab42450e426a26fd8ff4f72edf Mon Sep 17 00:00:00 2001
From: Araxeus
Date: Fri, 23 Apr 2021 04:06:54 +0300
Subject: [PATCH 41/52] `win.once()` instead of `win.on`
---
plugins/in-app-menu/back.js | 2 +-
plugins/taskbar-mediacontrol/back.js | 2 +-
plugins/touchbar/back.js | 2 +-
plugins/utils.js | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/in-app-menu/back.js b/plugins/in-app-menu/back.js
index 8365ac8b..82b0af4f 100644
--- a/plugins/in-app-menu/back.js
+++ b/plugins/in-app-menu/back.js
@@ -41,7 +41,7 @@ module.exports = (winImport) => {
});
//set menu visibility on load
- win.webContents.on("did-finish-load", () => {
+ win.webContents.once("did-finish-load", () => {
// fix bug with menu not applying on start when no internet connection available
setMenuVisibility(!config.get("options.hideMenu"));
});
diff --git a/plugins/taskbar-mediacontrol/back.js b/plugins/taskbar-mediacontrol/back.js
index b4d7dd3c..a8133539 100644
--- a/plugins/taskbar-mediacontrol/back.js
+++ b/plugins/taskbar-mediacontrol/back.js
@@ -24,7 +24,7 @@ module.exports = win => {
const {playPause, next, previous} = getSongControls(win);
// If the page is ready, register the callback
- win.on('ready-to-show', () => {
+ win.once('ready-to-show', () => {
registerCallback(songInfo => {
// Wait for song to start before setting thumbar
if (songInfo.title === '') {
diff --git a/plugins/touchbar/back.js b/plugins/touchbar/back.js
index 87240ed0..0fca17a7 100644
--- a/plugins/touchbar/back.js
+++ b/plugins/touchbar/back.js
@@ -63,7 +63,7 @@ module.exports = (win) => {
const { playPause, next, previous, like, dislike } = getSongControls(win);
// If the page is ready, register the callback
- win.on("ready-to-show", () => {
+ win.once("ready-to-show", () => {
controls = [previous, playPause, next, like, dislike];
// Register the callback
diff --git a/plugins/utils.js b/plugins/utils.js
index b265692f..ed8c7c0a 100644
--- a/plugins/utils.js
+++ b/plugins/utils.js
@@ -43,7 +43,7 @@ module.exports.fileExists = (path, callbackIfExists) => {
};
module.exports.injectCSS = (webContents, filepath, cb = undefined) => {
- webContents.on("did-finish-load", async () => {
+ webContents.once("did-finish-load", async () => {
await webContents.insertCSS(fs.readFileSync(filepath, "utf8"));
if (cb) {
cb();
From eae4cca1484d610e18c71ea6d191b433bffc6dbe Mon Sep 17 00:00:00 2001
From: Araxeus <78568641+Araxeus@users.noreply.github.com>
Date: Fri, 23 Apr 2021 04:25:48 +0300
Subject: [PATCH 42/52] Update readme.md
---
providers/prompt/readme.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/providers/prompt/readme.md b/providers/prompt/readme.md
index a3775b8d..613b4676 100644
--- a/providers/prompt/readme.md
+++ b/providers/prompt/readme.md
@@ -1,6 +1,6 @@
-# Prompt Documentation
+# Prompt Component Documentation
-
