Skip to content

Commit 660fce8

Browse files
committed
Merge branch 'local-upstream/master' into update-dependencies
2 parents 4bfca93 + bb1295c commit 660fce8

File tree

2 files changed

+26
-9
lines changed

2 files changed

+26
-9
lines changed

menu.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,24 @@ const mainMenuTemplate = (win) => {
4545
...getAllPlugins().map((plugin) => {
4646
const pluginPath = path.join(__dirname, "plugins", plugin, "menu.js")
4747
if (existsSync(pluginPath)) {
48+
let pluginLabel = plugin;
49+
if (pluginLabel === "crossfade") {
50+
pluginLabel = "crossfade [beta]";
51+
}
4852
if (!config.plugins.isEnabled(plugin)) {
49-
return pluginEnabledMenu(plugin, "", true, refreshMenu);
53+
return pluginEnabledMenu(plugin, pluginLabel, true, refreshMenu);
5054
}
5155
const getPluginMenu = require(pluginPath);
5256
return {
53-
label: plugin,
57+
label: pluginLabel,
5458
submenu: [
5559
pluginEnabledMenu(plugin, "Enabled", true, refreshMenu),
5660
{ type: "separator" },
5761
...getPluginMenu(win, config.plugins.getOptions(plugin), refreshMenu),
5862
],
5963
};
6064
}
61-
62-
let pluginLabel = plugin;
63-
if (pluginLabel === "crossfade") {
64-
pluginLabel = "crossfade [beta]";
65-
}
66-
67-
return pluginEnabledMenu(plugin, pluginLabel);
65+
return pluginEnabledMenu(plugin);
6866
}),
6967
],
7068
},

yarn.lock

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3144,6 +3144,13 @@ __metadata:
31443144
languageName: node
31453145
linkType: hard
31463146

3147+
"entities@npm:^4.4.0":
3148+
version: 4.5.0
3149+
resolution: "entities@npm:4.5.0"
3150+
checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7
3151+
languageName: node
3152+
linkType: hard
3153+
31473154
"env-editor@npm:^1.0.0":
31483155
version: 1.1.0
31493156
resolution: "env-editor@npm:1.1.0"
@@ -4626,6 +4633,18 @@ __metadata:
46264633
languageName: node
46274634
linkType: hard
46284635

4636+
"htmlparser2@npm:^8.0.2":
4637+
version: 8.0.2
4638+
resolution: "htmlparser2@npm:8.0.2"
4639+
dependencies:
4640+
domelementtype: ^2.3.0
4641+
domhandler: ^5.0.3
4642+
domutils: ^3.0.1
4643+
entities: ^4.4.0
4644+
checksum: 29167a0f9282f181da8a6d0311b76820c8a59bc9e3c87009e21968264c2987d2723d6fde5a964d4b7b6cba663fca96ffb373c06d8223a85f52a6089ced942700
4645+
languageName: node
4646+
linkType: hard
4647+
46294648
"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0":
46304649
version: 4.1.1
46314650
resolution: "http-cache-semantics@npm:4.1.1"

0 commit comments

Comments
 (0)