Merge branch 'master' into master

This commit is contained in:
Alexander Ushaev 2020-11-30 10:37:58 +07:00 committed by GitHub
commit b0700e1dc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 1802 additions and 1226 deletions

View file

@ -1769,8 +1769,11 @@ $("#commandInput input").keydown((e) => {
$("#commandLineWrapper #commandLine .suggestions").on("mouseover", (e) => {
$("#commandLineWrapper #commandLine .suggestions .entry").removeClass(
"active"
"activeKeyboard"
);
if (isPreviewingTheme) {
previewTheme(config.theme, false);
}
let hoverId = $(e.target).attr("command");
try {
let list = currentCommands[currentCommands.length - 1];
@ -2023,14 +2026,15 @@ function updateSuggestedCommands() {
function displayFoundCommands() {
$("#commandLine .suggestions").empty();
let commandsHTML = "";
let list = currentCommands[currentCommands.length - 1];
$.each(list.list, (index, obj) => {
if (obj.found && (obj.available !== undefined ? obj.available() : true)) {
$("#commandLine .suggestions").append(
'<div class="entry" command="' + obj.id + '">' + obj.display + "</div>"
);
commandsHTML +=
'<div class="entry" command="' + obj.id + '">' + obj.display + "</div>";
}
});
$("#commandLine .suggestions").html(commandsHTML);
if ($("#commandLine .suggestions .entry").length == 0) {
$("#commandLine .separator").css({ height: 0, margin: 0 });
} else {

View file

@ -176,7 +176,7 @@ const layouts = {
prog_dvorak: {
keymapShowTopRow: true,
keys: [
"$~", "[%", "[7", "{5", "}3", "(1", "=9", "*0", ")2", "+4", "]6", "!8", "#`",
"$~", "&%", "[7", "{5", "}3", "(1", "=9", "*0", ")2", "+4", "]6", "!8", "#`",
";:", ",<", ".>", "pP", "yY", "fF", "gG", "cC", "rR", "lL", "/?", "@^", "\\|",
"aA", "oO", "eE", "uU", "iI", "dD", "hH", "tT", "nN", "sS", "-_",
"\\|", "'\"", "qQ", "jJ", "kK", "xX", "bB", "mM", "wW", "vV", "zZ",

View file

@ -726,6 +726,20 @@ function punctuateWord(previousWord, currentWord, index, maxindex) {
) {
//1% chance to add quotes
word = `"${word}"`;
} else if (
Math.random() < 0.01 &&
getLastChar(previousWord) != "," &&
getLastChar(previousWord) != "."
) {
//1% chance to add single quotes
word = `'${word}'`;
} else if (
Math.random() < 0.01 &&
getLastChar(previousWord) != "," &&
getLastChar(previousWord) != "."
) {
//1% chance to add parentheses
word = `(${word})`;
} else if (Math.random() < 0.01) {
//1% chance to add a colon
word = word + ":";
@ -843,14 +857,15 @@ function addWord() {
function showWords() {
$("#words").empty();
let wordsHTML = "";
for (let i = 0; i < wordsList.length; i++) {
let w = "<div class='word'>";
wordsHTML += "<div class='word'>";
for (let c = 0; c < wordsList[i].length; c++) {
w += "<letter>" + wordsList[i].charAt(c) + "</letter>";
wordsHTML += "<letter>" + wordsList[i].charAt(c) + "</letter>";
}
w += "</div>";
$("#words").append(w);
wordsHTML += "</div>";
}
$("#words").html(wordsHTML);
$("#wordsWrapper").removeClass("hidden");
const wordHeight = $(document.querySelector(".word")).outerHeight(true);
@ -3105,6 +3120,7 @@ function toggleResultWordsDisplay() {
async function loadWordsHistory() {
$("#resultWordsHistory .words").empty();
let wordsHTML = "";
for (let i = 0; i < inputHistory.length + 2; i++) {
let input = inputHistory[i];
let wordEl = "";
@ -3215,8 +3231,9 @@ async function loadWordsHistory() {
wordEl += "</div>";
} catch (e) {}
}
$("#resultWordsHistory .words").append(wordEl);
wordsHTML += wordEl;
}
$("#resultWordsHistory .words").html(wordsHTML);
$("#showWordHistoryButton").addClass("loaded");
return true;
}
@ -4243,6 +4260,11 @@ $(document).keydown((event) => {
}
}
//blocking firefox from going back in history with backspace
if (event.key === "Backspace") {
event.preventDefault();
}
//only for the typing test
if ($("#wordsInput").is(":focus")) {
const isBackspace =

View file

@ -3491,8 +3491,6 @@
<script src="js/jquery.color.min.js"></script>
<script src="js/easing.js"></script>
<script src="js/jquery.cookie-1.4.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/2.1.3/TweenMax.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/2.1.3/jquery.gsap.min.js"></script>
<script src="js/moment.min.js"></script>
<script src="js/html2canvas.min.js"></script>
<script src="js/monkeytype.js"></script>

View file

@ -0,0 +1,335 @@
{
"name": "code_html",
"leftToRight": true,
"words": [
"action",
"alt",
"class",
"fill",
"for",
"height",
"href",
"href",
"href",
"href",
"id",
"kind",
"max",
"media",
"method",
"min",
"name",
"src",
"src",
"src",
"srclang",
"srcset",
"stroke",
"stroke-width",
"style",
"stylesheet",
"stylesheet",
"title",
"type",
"type",
"value",
"width",
"<!DOCTYPE",
"<!--",
"-->",
"<a",
"</a>",
"<a",
"</a>",
"<a",
"</a>",
"<a",
"</a>",
"<abbr",
"</abbr>",
"<address>",
"</address>",
"<area",
"<article>",
"</article>",
"<aside>",
"</aside>",
"<audio",
"</audio>",
"<b>",
"</b>",
"<b>",
"</b>",
"<b>",
"</b>",
"<b>",
"</b>",
"<base",
"<bdi>",
"</bdi>",
"<bdo",
"</bdo>",
"<blockquote",
"</blockquote>",
"<body>",
"</body>",
"<body>",
"</body>",
"<body>",
"</body>",
"<body>",
"</body>",
"<br>",
"<br>",
"<br>",
"<br>",
"<button",
"</button>",
"<canvas",
"</canvas>",
"<caption>",
"</caption>",
"<cite>",
"</cite>",
"<code>",
"</code>",
"<colgroup>",
"<col",
"</colgroup>",
"<data",
"</data>",
"<datalist",
"</datalist>",
"<dd>",
"</dd>",
"<dl>",
"</dl>",
"<del>",
"</del>",
"<details>",
"</details>",
"<dfn",
"</dfn>",
"<dialog",
"</dialog>",
"<div",
"</div>",
"<div",
"</div>",
"<div",
"</div>",
"<div",
"</div>",
"<dt>",
"</dt>",
"<em>",
"</em>",
"<embed",
"<fieldset>",
"</fieldset>",
"<figcaption>",
"</figcaption>",
"<figure>",
"</figure>",
"<form",
"</form>",
"<footer>",
"</footer>",
"<label",
"</label>",
"<header>",
"</header>",
"<head>",
"</head>",
"<head>",
"</head>",
"<head>",
"</head>",
"<head>",
"</head>",
"<html",
"</html>",
"<html",
"</html>",
"<html",
"</html>",
"<html",
"</html>",
"<hr>",
"<h1>",
"</h1>",
"<h2>",
"</h2>",
"<h3>",
"</h3>",
"<h4>",
"</h4>",
"<h5>",
"</h5>",
"<h6>",
"</h6>",
"<i>",
"</i>",
"<i>",
"</i>",
"<i>",
"</i>",
"<iframe",
"</iframe>",
"<img",
"<img",
"<img",
"<img",
"<input",
"<ins>",
"</ins>",
"<kbd>",
"</kbd>",
"<legend>",
"</legend>",
"<li>",
"</li>",
"<li>",
"</li>",
"<li>",
"</li>",
"<li>",
"</li>",
"<link",
"<link",
"<main>",
"</main>",
"<map",
"</map>",
"<mark>",
"</mark>",
"<meta",
"<meter",
"</meter>",
"<nav>",
"</nav>",
"<noscript>",
"</noscript>",
"<object",
"</object>",
"<ol>",
"</ol>",
"<ol>",
"</ol>",
"<ol>",
"</ol>",
"<ol>",
"</ol>",
"<optgroup",
"</optgroup>",
"<option",
"</option>",
"<output",
"</output>",
"<p>",
"</p>",
"<p>",
"</p>",
"<p>",
"</p>",
"<p>",
"</p>",
"<p>",
"</p>",
"<p>",
"</p>",
"<param",
"<picture>",
"</picture>",
"<pre>",
"</pre>",
"<progress",
"</progress>",
"<q>",
"</q>",
"<rp>",
"</rp>",
"<ruby>",
"</ruby>",
"<rt>",
"</rt>",
"<s>",
"</s>",
"<samp>",
"</samp>",
"<script>",
"</script>",
"<script>",
"</script>",
"<section>",
"</section>",
"<select",
"</select>",
"<source",
"<span",
"</span>",
"<span",
"</span>",
"<span",
"</span>",
"<span",
"</span>",
"<strong>",
"<strong>",
"<strong>",
"<strong>",
"</strong>",
"<style",
"<style>",
"<style",
"<style>",
"<sub>",
"</sub>",
"<summary>",
"</summary>",
"<sup>",
"</sup>",
"<svg",
"</svg>",
"<table>",
"</table>",
"<tbody>",
"</tbody>",
"<td>",
"</td>",
"<template>",
"</template>",
"<textarea",
"</textarea>",
"<tfoot>",
"</tfoot>",
"<thead>",
"</thead>",
"<th>",
"</th>",
"<time",
"<time>",
"</time>",
"<title>",
"</title>",
"<title>",
"</title>",
"<track",
"<u>",
"</u>",
"<ul>",
"</ul>",
"<ul>",
"</ul>",
"<ul>",
"</ul>",
"<ul>",
"</ul>",
"<var>",
"</var>",
"<video",
"</video>",
"<wbr>",
"</wbr>"
]
}

View file

@ -0,0 +1,206 @@
{
"name": "filipino",
"leftToRight": true,
"words": [
"sa",
"na",
"ang",
"ng",
"mga",
"ko",
"ay",
"ako",
"lang",
"hindi",
"pa",
"mo",
"may",
"kung",
"ni",
"naman",
"si",
"ka",
"ito",
"ung",
"para",
"isa",
"nga",
"ba",
"pero",
"siya",
"niya",
"din",
"kaya",
"o",
"kasi",
"dahil",
"wala",
"nang",
"lahat",
"nila",
"sila",
"kami",
"talaga",
"ngayon",
"ano",
"alam",
"po",
"eh",
"iyon",
"kahit",
"dito",
"namin",
"kaniya",
"tao",
"kay",
"kayo",
"daw",
"pag",
"akin",
"sana",
"natin",
"buhay",
"nung",
"iyan",
"tayo",
"bakit",
"sabi",
"gusto",
"dapat",
"pala",
"tapos",
"mas",
"lamang",
"iba",
"kanila",
"upang",
"araw",
"atin",
"nasa",
"nito",
"mula",
"anak",
"nyo",
"noong",
"maging",
"doon",
"diyos",
"kapag",
"hanggang",
"baka",
"bagay",
"ikaw",
"kasama",
"taon",
"mahal",
"kita",
"ninyo",
"ha",
"ngunit",
"marami",
"bahay",
"nyan",
"bilang",
"siguro",
"kailangan",
"sarili",
"bago",
"sino",
"saan",
"habang",
"minsan",
"pinoy",
"inyo",
"loob",
"basta",
"muna",
"ilan",
"bansa",
"panahon",
"meron",
"ayaw",
"babae",
"ano",
"dating",
"buong",
"iyo",
"lalo",
"bayan",
"ulit",
"sobra",
"oo",
"mag",
"wag",
"tungkol",
"tama",
"galing",
"pwede",
"noon",
"tulad",
"medyo",
"kaibigan",
"bata",
"dalawa",
"kundi",
"ayon",
"paano",
"oras",
"nag",
"puso",
"maganda",
"bawat",
"masaya",
"una",
"salamat",
"kapatid",
"ama",
"pati",
"pamamagitan",
"totoo",
"tunay",
"amin",
"sapagkat",
"lagi",
"lalaki",
"gawa",
"kanina",
"ganun",
"pagkatapos",
"irap",
"problema",
"pangalan",
"ewan",
"mundo",
"grabe",
"dati",
"tuloy",
"mahirap",
"pangyayari",
"panginoon",
"trabaho",
"gabi",
"kaso",
"eto",
"buti",
"pag-ibig",
"tanong",
"halos",
"dami",
"kuya",
"sina",
"daan",
"ganito",
"sige",
"lugar",
"syempre",
"lang",
"asawa",
"laban",
"bukas",
"kahapon",
"yata",
"akala",
"gaya",
"hirap"
]
}

File diff suppressed because it is too large Load diff

View file

@ -1,43 +1,46 @@
[
"english",
"english_1k",
"english_10k",
"spanish",
"spanish_1k",
"french",
"arabic",
"mongolian",
"russian",
"russian_1k",
"russian_10k",
"portuguese",
"indonesian",
"german",
"turkish",
"italian",
"thai",
"polish",
"czech",
"slovak",
"dutch",
"danish",
"danish_1k",
"danish_10k",
"hungarian",
"hungarian_2.5k",
"norwegian",
"hebrew",
"icelandic_1k",
"romanian",
"finnish",
"persian",
"kazakh",
"vietnamese",
"vietnamese_1k",
"vietnamese_5k",
"lojban_gismu",
"lojban_cmavo",
"code_python",
"code_c",
"code_javascript"
"english"
,"english_1k"
,"english_10k"
,"spanish"
,"spanish_1k"
,"french"
,"arabic"
,"mongolian"
,"russian"
,"russian_1k"
,"russian_10k"
,"portuguese"
,"indonesian"
,"german"
,"turkish"
,"italian"
,"italian_1k"
,"thai"
,"polish"
,"czech"
,"slovak"
,"dutch"
,"filipino"
,"danish"
,"danish_1k"
,"danish_10k"
,"hungarian"
,"hungarian_2.5k"
,"norwegian"
,"hebrew"
,"icelandic_1k"
,"romanian"
,"finnish"
,"persian"
,"kazakh"
,"vietnamese"
,"vietnamese_1k"
,"vietnamese_5k"
,"lojban_gismu"
,"lojban_cmavo"
,"code_python"
,"code_c"
,"code_javascript"
,"code_html"
]

File diff suppressed because it is too large Load diff

View file

@ -77,7 +77,7 @@
"yeni",
"önce",
"başka",
"hâl",
"hal",
"orta",
"su",
"girmek",

View file

@ -2,7 +2,7 @@
--bg-color: #000000;
--main-color: #15ff00;
--caret-color: #15ff00;
--sub-color: #032700;
--sub-color: #003B00;
--text-color: #adffa7;
--error-color: #da3333;
--error-extra-color: #791717;