monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2024-09-20 23:36:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed custom popup not working on firefox

Browse source
This commit is contained in:
Miodec 2021-03-12 20:48:25 +00:00
parent 32744751c4
commit 8b234b0eb0
4 changed files with 59 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/js/commandline.js
View file

@ -633,7 +633,7 @@ let commands = {
showCustomTextPopup();
setTimeout(() => {
// Workaround to focus textarea since hideCommandLine() will focus test words
$("#CustomTextPopup textarea").focus();
$("#customTextPopup textarea").focus();
}, 150);
},
},

82
src/js/script.js
View file

@ -3127,7 +3127,7 @@ function setMode(mode, nosave) {
if (config.mode == "time") {
$("#top .config .wordCount").addClass("hidden");
$("#top .config .time").removeClass("hidden");
$("#top .config .CustomText").addClass("hidden");
$("#top .config .customText").addClass("hidden");
$("#top .config .punctuationMode").removeClass("disabled");
$("#top .config .numbersMode").removeClass("disabled");
$("#top .config .punctuationMode").removeClass("hidden");
@ -3136,7 +3136,7 @@ function setMode(mode, nosave) {
} else if (config.mode == "words") {
$("#top .config .wordCount").removeClass("hidden");
$("#top .config .time").addClass("hidden");
$("#top .config .CustomText").addClass("hidden");
$("#top .config .customText").addClass("hidden");
$("#top .config .punctuationMode").removeClass("disabled");
$("#top .config .numbersMode").removeClass("disabled");
$("#top .config .punctuationMode").removeClass("hidden");
@ -3153,7 +3153,7 @@ function setMode(mode, nosave) {
}
$("#top .config .wordCount").addClass("hidden");
$("#top .config .time").addClass("hidden");
$("#top .config .CustomText").removeClass("hidden");
$("#top .config .customText").removeClass("hidden");
$("#top .config .punctuationMode").removeClass("disabled");
$("#top .config .numbersMode").removeClass("disabled");
$("#top .config .punctuationMode").removeClass("hidden");
@ -3165,7 +3165,7 @@ function setMode(mode, nosave) {
setToggleSettings(false, nosave);
$("#top .config .wordCount").addClass("hidden");
$("#top .config .time").addClass("hidden");
$("#top .config .CustomText").addClass("hidden");
$("#top .config .customText").addClass("hidden");
$("#top .config .punctuationMode").addClass("disabled");
$("#top .config .numbersMode").addClass("disabled");
$("#top .config .punctuationMode").removeClass("hidden");
@ -3175,7 +3175,7 @@ function setMode(mode, nosave) {
} else if (config.mode == "zen") {
$("#top .config .wordCount").addClass("hidden");
$("#top .config .time").addClass("hidden");
$("#top .config .CustomText").addClass("hidden");
$("#top .config .customText").addClass("hidden");
$("#top .config .punctuationMode").addClass("hidden");
$("#top .config .numbersMode").addClass("hidden");
$("#top .config .quoteLength").addClass("hidden");
@ -3834,30 +3834,30 @@ function hideCapsWarning() {
}
function showCustomTextPopup() {
if ($("#CustomTextPopupWrapper").hasClass("hidden")) {
if ($("#CustomTextPopup .check input").prop("checked")) {
$("#CustomTextPopup .inputs .randomInputFields").removeClass("hidden");
if ($("#customTextPopupWrapper").hasClass("hidden")) {
if ($("#customTextPopup .check input").prop("checked")) {
$("#customTextPopup .inputs .randomInputFields").removeClass("hidden");
} else {
$("#CustomTextPopup .inputs .randomInputFields").addClass("hidden");
$("#customTextPopup .inputs .randomInputFields").addClass("hidden");
}
$("#CustomTextPopupWrapper")
$("#customTextPopupWrapper")
.stop(true, true)
.css("opacity", 0)
.removeClass("hidden")
.animate({ opacity: 1 }, 100, () => {
let newtext = CustomText.text.join(" ");
newtext = newtext.replace(/\n /g, "\n");
$("#CustomTextPopup textarea").val(newtext);
$("#CustomTextPopup .wordcount input").val(CustomText.word);
$("#CustomTextPopup .time input").val(CustomText.time);
$("#CustomTextPopup textarea").focus();
$("#customTextPopup textarea").val(newtext);
$("#customTextPopup .wordcount input").val(CustomText.word);
$("#customTextPopup .time input").val(CustomText.time);
$("#customTextPopup textarea").focus();
});
}
}
function hideCustomTextPopup() {
if (!$("#CustomTextPopupWrapper").hasClass("hidden")) {
$("#CustomTextPopupWrapper")
if (!$("#customTextPopupWrapper").hasClass("hidden")) {
$("#customTextPopupWrapper")
.stop(true, true)
.css("opacity", 1)
.animate(
@ -3866,42 +3866,42 @@ function hideCustomTextPopup() {
},
100,
(e) => {
$("#CustomTextPopupWrapper").addClass("hidden");
$("#customTextPopupWrapper").addClass("hidden");
}
);
}
}
$("#CustomTextPopupWrapper").mousedown((e) => {
$("#customTextPopupWrapper").mousedown((e) => {
if ($(e.target).attr("id") === "CustomTextPopupWrapper") {
hideCustomTextPopup();
}
});
$("#CustomTextPopup .inputs .check input").change(() => {
if ($("#CustomTextPopup .check input").prop("checked")) {
$("#CustomTextPopup .inputs .randomInputFields").removeClass("hidden");
$("#customTextPopup .inputs .check input").change(() => {
if ($("#customTextPopup .check input").prop("checked")) {
$("#customTextPopup .inputs .randomInputFields").removeClass("hidden");
} else {
$("#CustomTextPopup .inputs .randomInputFields").addClass("hidden");
$("#customTextPopup .inputs .randomInputFields").addClass("hidden");
}
});
$("#CustomTextPopup textarea").keypress((e) => {
$("#customTextPopup textarea").keypress((e) => {
if (e.code === "Enter" && e.ctrlKey) {
$("#CustomTextPopup .button").click();
$("#customTextPopup .button").click();
}
});
$("#CustomTextPopup .randomInputFields .wordcount input").keypress((e) => {
$("#CustomTextPopup .randomInputFields .time input").val("");
$("#customTextPopup .randomInputFields .wordcount input").keypress((e) => {
$("#customTextPopup .randomInputFields .time input").val("");
});
$("#CustomTextPopup .randomInputFields .time input").keypress((e) => {
$("#CustomTextPopup .randomInputFields .wordcount input").val("");
$("#customTextPopup .randomInputFields .time input").keypress((e) => {
$("#customTextPopup .randomInputFields .wordcount input").val("");
});
$("#CustomTextPopup .button").click(() => {
let text = $("#CustomTextPopup textarea").val();
$("#customTextPopup .button").click(() => {
let text = $("#customTextPopup textarea").val();
text = text.trim();
// text = text.replace(/[\r]/gm, " ");
text = text.replace(/\\\\t/gm, "\t");
@ -3913,22 +3913,22 @@ $("#CustomTextPopup .button").click(() => {
// text = text.replace(/(\n)+/g, "\n");
// text = text.replace(/(\r)+/g, "\r");
text = text.replace(/( *(\r\n|\r|\n) *)/g, "\n ");
if ($("#CustomTextPopup .typographyCheck input").prop("checked")) {
if ($("#customTextPopup .typographyCheck input").prop("checked")) {
text = Misc.cleanTypographySymbols(text);
}
// text = Misc.remove_non_ascii(text);
text = text.replace(/[\u2060]/g, "");
text = text.split(" ");
CustomText.setText(text);
CustomText.setWord(parseInt($("#CustomTextPopup .wordcount input").val()));
CustomText.setTime(parseInt($("#CustomTextPopup .time input").val()));
CustomText.setWord(parseInt($("#customTextPopup .wordcount input").val()));
CustomText.setTime(parseInt($("#customTextPopup .time input").val()));
CustomText.setIsWordRandom(
$("#CustomTextPopup .check input").prop("checked") &&
$("#customTextPopup .check input").prop("checked") &&
!isNaN(CustomText.word)
);
CustomText.setIsTimeRandom(
$("#CustomTextPopup .check input").prop("checked") &&
$("#customTextPopup .check input").prop("checked") &&
!isNaN(CustomText.time)
);
@ -4406,7 +4406,7 @@ $(document).on("click", "#top .config .quoteLength .text-button", (e) => {
restartTest();
});
$(document).on("click", "#top .config .CustomText .text-button", () => {
$(document).on("click", "#top .config .customText .text-button", () => {
showCustomTextPopup();
});
@ -4734,7 +4734,7 @@ $(document).keydown(function (event) {
let commandLineVisible = !$("#commandLineWrapper").hasClass("hidden");
let wordsFocused = $("#wordsInput").is(":focus");
let modePopupVisible =
!$("#CustomTextPopupWrapper").hasClass("hidden") ||
!$("#customTextPopupWrapper").hasClass("hidden") ||
!$("#customMode2PopupWrapper").hasClass("hidden");
if (
pageTestActive &&
@ -4816,10 +4816,10 @@ function handleTab(event) {
if (resultCalculating) {
event.preventDefault();
}
if ($("#CustomTextPopup .textarea").is(":focus")) {
if ($("#customTextPopup .textarea").is(":focus")) {
event.preventDefault();
let area = $("#CustomTextPopup .textarea")[0];
let area = $("#customTextPopup .textarea")[0];
var start = area.selectionStart;
var end = area.selectionEnd;
@ -4832,8 +4832,8 @@ function handleTab(event) {
area.selectionStart = area.selectionEnd = start + 1;
// event.preventDefault();
// $("#CustomTextPopup .textarea").val(
// $("#CustomTextPopup .textarea").val() + "\t"
// $("#customTextPopup .textarea").val(
// $("#customTextPopup .textarea").val() + "\t"
// );
return;
} else if (

12
src/sass/style.scss
View file

@ -389,7 +389,7 @@ a:hover {
}
}
#CustomTextPopupWrapper {
#customTextPopupWrapper {
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.75);
@ -402,7 +402,7 @@ a:hover {
align-items: center;
padding: 5rem 0;
#CustomTextPopup {
#customTextPopup {
background: var(--bg-color);
border-radius: var(--roundness);
padding: 2rem;
@ -455,7 +455,7 @@ a:hover {
height: 0;
display: none;
& ~ .CustomTextRandomCheckbox {
& ~ .customTextRandomCheckbox {
width: 12px;
height: 12px;
background: rgba(0, 0, 0, 0.1);
@ -466,7 +466,7 @@ a:hover {
transition: 0.25s;
}
&:checked ~ .CustomTextRandomCheckbox {
&:checked ~ .customTextRandomCheckbox {
background: var(--main-color);
}
}
@ -489,7 +489,7 @@ a:hover {
height: 0;
display: none;
& ~ .CustomTextTypographyCheckbox {
& ~ .customTextTypographyCheckbox {
width: 12px;
height: 12px;
background: rgba(0, 0, 0, 0.1);
@ -500,7 +500,7 @@ a:hover {
transition: 0.25s;
}
&:checked ~ .CustomTextTypographyCheckbox {
&:checked ~ .customTextTypographyCheckbox {
background: var(--main-color);
}
}

21
static/index.html
View file

@ -101,13 +101,13 @@
<div class="button">ok</div>
</div>
</div>
<div id="CustomTextPopupWrapper" class="hidden">
<div id="CustomTextPopup" action="">
<div id="customTextPopupWrapper" class="hidden">
<div id="customTextPopup" action="">
<textarea class="textarea" placeholder="Custom text"></textarea>
<div class="inputs">
<label class="check">
<input type="checkbox" />
<div class="CustomTextRandomCheckbox"></div>
<div class="customTextRandomCheckbox"></div>
Random
<span>
Randomise the above words, and control how many words are
@ -127,7 +127,7 @@
</div>
<label class="typographyCheck">
<input type="checkbox" checked />
<div class="CustomTextTypographyCheckbox"></div>
<div class="customTextTypographyCheckbox"></div>
Remove Fancy Typography
<span>
Standardises typography symbols (for example “ and ” become ")
@ -965,7 +965,7 @@
</div>
</div>
</div>
<div class="group CustomText hidden">
<div class="group customText hidden">
<!-- <div class="title">time</div> -->
<div class="buttons">
<div class="text-button">change</div>
@ -1943,11 +1943,12 @@
<div class="text">
This mode will force you to use opposite
<key>shift</key>
keys for shifting. Using an incorrect one will count as
an error. This feature ignores keys in locations
<key>B</key>,
<key>Y</key>,
and
keys for shifting. Using an incorrect one will count as an
error. This feature ignores keys in locations
<key>B</key>
,
<key>Y</key>
, and
<key>^</key>
because many people use the other hand for those keys.
</div>