monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-03-13 15:36:42 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixed presets and tags not working in new command line

Browse source
This commit is contained in:
Jack 2021-07-02 00:52:52 +01:00
parent 6a861f1220
commit 8f870d3e5b
2 changed files with 42 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/js/commandline-lists.js
View file

@ -206,7 +206,8 @@ export function updateTagCommands() {
commandsTags.list.push({
id: "clearTags",
display: "Clear tags",
display: `Clear tags`,
icon: "fa-times",
exec: () => {
DB.getSnapshot().tags.forEach((tag) => {
tag.active = false;
@ -220,13 +221,14 @@ export function updateTagCommands() {
let dis = tag.name;
if (tag.active === true) {
dis = '<i class="fas fa-check-square"></i>' + dis;
dis = '<i class="fas fa-fw fa-check"></i>' + dis;
} else {
dis = '<i class="fas fa-square"></i>' + dis;
dis = '<i class="fas fa-fw"></i>' + dis;
}
commandsTags.list.push({
id: "toggleTag" + tag.id,
noIcon: true,
display: dis,
sticky: true,
exec: () => {
@ -235,14 +237,17 @@ export function updateTagCommands() {
let txt = tag.name;
if (tag.active === true) {
txt = '<i class="fas fa-check-square"></i>' + txt;
txt = '<i class="fas fa-fw fa-check"></i>' + txt;
} else {
txt = '<i class="fas fa-square"></i>' + txt;
txt = '<i class="fas fa-fw"></i>' + txt;
}
if (Commandline.isSingleListCommandLineActive()) {
$(
`#commandLine .suggestions .entry[command='toggleTag${tag.id}']`
).html("Change tags > " + txt);
).html(
`<div class="icon"><i class="fas fa-fw fa-tag"></i></div><div>Tags > ` +
txt
);
} else {
$(
`#commandLine .suggestions .entry[command='toggleTag${tag.id}']`
@ -256,7 +261,7 @@ export function updateTagCommands() {
}
let commandsPresets = {
title: "Apply preset...",
title: "Presets...",
list: [],
};
@ -2208,10 +2213,6 @@ export let defaultCommands = {
UpdateConfig.togglePunctuation();
},
},
// exec: () => {
// UpdateConfig.togglePunctuation();
// TestLogic.restart();
// },
},
{
id: "changeMode",
@ -2242,24 +2243,32 @@ export let defaultCommands = {
{
visible: false,
id: "changeTags",
display: "Change tags...",
subgroup: true,
exec: () => {
display: "Tags...",
icon: "fa-tag",
subgroup: commandsTags,
beforeSubgroup: () => {
updateTagCommands();
current.push(commandsTags);
Commandline.show();
},
// exec: () => {
// updateTagCommands();
// current.push();
// Commandline.show();
// },
},
{
visible: false,
id: "applyPreset",
display: "Apply preset...",
subgroup: true,
exec: () => {
display: "Presets...",
icon: "fa-sliders-h",
subgroup: commandsPresets,
beforeSubgroup: () => {
updatePresetCommands();
current.push(commandsPresets);
Commandline.show();
},
// exec: () => {
// updatePresetCommands();
// current.push(commandsPresets);
// Commandline.show();
// },
},
{
id: "changeConfidenceMode",

13
src/js/commandline.js
View file

@ -46,7 +46,11 @@ function showFound() {
icon = `<i class="fas fa-fw"></i>`;
}
}
commandsHTML += `<div class="entry" command="${obj.id}"><div class="icon">${icon}</div><div>${obj.display}</div></div>`;
let iconHTML = `<div class="icon">${icon}</div>`;
if (obj.noIcon && !isSingleListCommandLineActive()) {
iconHTML = "";
}
commandsHTML += `<div class="entry" command="${obj.id}">${iconHTML}<div>${obj.display}</div></div>`;
}
});
$("#commandLine .suggestions").html(commandsHTML);
@ -169,6 +173,9 @@ function trigger(command) {
showInput(obj.id, obj.display, obj.defaultValue);
} else if (obj.subgroup) {
subgroup = true;
if (obj.beforeSubgroup) {
obj.beforeSubgroup();
}
CommandlineLists.current.push(obj.subgroup);
show();
} else {
@ -226,6 +233,10 @@ function addChildCommands(
) {
icon = `<i class="fas fa-fw fa-check"></i>`;
}
if (commandItem.noIcon) {
icon = "";
}
if (parentCommandDisplay)
commandItemDisplay =
parentCommandDisplay + " > " + icon + commandItemDisplay;