smueller/youtube-music
1
0
Fork 0
mirror of https://github.com/th-ch/youtube-music.git synced 2026-01-13 19:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor and stylecheck

Browse Source
This commit is contained in:
Araxeus
2021-04-03 22:04:40 +03:00
parent 317521bba6
commit 70b03b71e4
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
menu.js
View File

@ -147,7 +147,6 @@ const mainMenuTemplate = (win) => [
label: "Proxy", label: "Proxy",
type: "checkbox", type: "checkbox",
checked: !!config.get("options.proxy"), checked: !!config.get("options.proxy"),
//fixed: true, //skip in-app-menu click() override
click: (item) => { click: (item) => {
setProxy(item, win); setProxy(item, win);
} }
@ -310,7 +309,6 @@ module.exports.setApplicationMenu = (win) => {
Menu.setApplicationMenu(menu); Menu.setApplicationMenu(menu);
}; };
//
const iconPath = path.join(__dirname, "assets", "youtube-music-tray.png"); const iconPath = path.join(__dirname, "assets", "youtube-music-tray.png");
function setProxy(item, win) { function setProxy(item, win) {
prompt({ prompt({
@ -326,7 +324,6 @@ function setProxy(item, win) {
}) })
.then((input) => { .then((input) => {
if(input !== null) { if(input !== null) {
console.log(`setting proxy to ${input}`);
config.set("options.proxy", input); config.set("options.proxy", input);
if(input === "") if(input === "")
item.checked = false; item.checked = false;

13
plugins/in-app-menu/back.js
View File

@ -9,6 +9,8 @@ const { injectCSS } = require("../utils");
//check that menu doesn't get created twice //check that menu doesn't get created twice
let done = false; let done = false;
//tracks menu visibility
let visible = true;
// win hook for fixing menu // win hook for fixing menu
let win; let win;
@ -41,17 +43,22 @@ module.exports = (winImport) => {
//register keyboard shortcut && hide menu if hideMenu is enabled //register keyboard shortcut && hide menu if hideMenu is enabled
if (config.get("options.hideMenu")) { if (config.get("options.hideMenu")) {
switchMenuVisibility(); visible = false;
electronLocalshortcut.register(win, "Esc", () => { electronLocalshortcut.register(win, "Esc", () => {
switchMenuVisibility(); switchMenuVisibility();
}); });
} }
// fix bug with menu not applying on start
setMenuVisibility(visible);
}); });
}; };
let visible = false;
function switchMenuVisibility() { function switchMenuVisibility() {
visible = !visible; setMenuVisibility(!visible);
}
function setMenuVisibility(value){
visible = value;
win.webContents.send("updateMenu", visible); win.webContents.send("updateMenu", visible);
} }