From 83b3d9e66d58e85bc40c73bea1b354f002b0eb65 Mon Sep 17 00:00:00 2001 From: seaerchin Date: Wed, 7 Apr 2021 23:50:14 +0800 Subject: [PATCH 01/20] feat(static/keymap): adds static files for keymap legend stylkes --- static/keymap/legend/_list.json | 12 ++++++++++++ static/keymap/legend/index.js | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 static/keymap/legend/_list.json create mode 100644 static/keymap/legend/index.js diff --git a/static/keymap/legend/_list.json b/static/keymap/legend/_list.json new file mode 100644 index 000000000..573f0ef20 --- /dev/null +++ b/static/keymap/legend/_list.json @@ -0,0 +1,12 @@ +[ + { + "name": "lowercase" + }, + { + "name": "UPPERCASE" + }, + { + "name": "blank" + } + ] + \ No newline at end of file diff --git a/static/keymap/legend/index.js b/static/keymap/legend/index.js new file mode 100644 index 000000000..3c3db597f --- /dev/null +++ b/static/keymap/legend/index.js @@ -0,0 +1,2 @@ +export * as keymapLegendStyles from "./_list.json"; +export const KEYMAP_LEGEND_TITLE = "keymapLegendStyle"; From 60081674c4a3c254a483e7abbb8d8c3ed1c06ee6 Mon Sep 17 00:00:00 2001 From: seaerchin Date: Wed, 7 Apr 2021 23:51:39 +0800 Subject: [PATCH 02/20] feat(config): adds keymap legend styles defaults and update functions to config --- src/js/config.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/js/config.js b/src/js/config.js index e36848af7..d75dca891 100644 --- a/src/js/config.js +++ b/src/js/config.js @@ -17,6 +17,7 @@ import * as PaceCaret from "./pace-caret"; import * as UI from "./ui"; import * as CommandlineLists from "./commandline-lists"; import * as BackgroundFilter from "./custom-background-filter"; +import keymapLegendStyles from "../../static/keymap/legend/_list.json"; export let cookieConfig = null; export let dbConfigLoaded = false; @@ -87,6 +88,7 @@ let defaultConfig = { keymapMode: "off", keymapStyle: "staggered", keymapLayout: "qwerty", + keymapLegendStyle: "lowercase", fontFamily: "Roboto_Mono", smoothLineScroll: false, alwaysShowDecimalPlaces: false, @@ -1264,6 +1266,17 @@ export function setKeymapMode(mode, nosave) { if (!nosave) saveToCookie(); } +export function setKeymapLegendStyle(style = "lowercase", shouldSave = true) { + // Remove existing styles + keymapLegendStyles.forEach(({ name }) => { + $(".keymapLegendStyle").removeClass(name); + }); + + // Save to cookie for persistence + config.keymapLegendStyle = style; + if (shouldSave) saveToCookie(); +} + export function setKeymapStyle(style, nosave) { $(".keymap").removeClass("matrix"); $(".keymap").removeClass("split"); @@ -1375,7 +1388,7 @@ export function setCustomBackground(value, nosave) { } export function setCustomBackgroundSize(value, nosave) { - if (value != "cover" && value != "contain" && value!= "max") { + if (value != "cover" && value != "contain" && value != "max") { value = "cover"; } config.customBackgroundSize = value; From 755d4489e3f785a57ee9b9da8b6b64edf34f4ecd Mon Sep 17 00:00:00 2001 From: seaerchin Date: Thu, 8 Apr 2021 00:06:43 +0800 Subject: [PATCH 03/20] feat(settings): added keymap legends style --- src/js/settings.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/js/settings.js b/src/js/settings.js index 41a142d83..fb7c6e5d1 100644 --- a/src/js/settings.js +++ b/src/js/settings.js @@ -13,6 +13,7 @@ import * as TagController from "./tag-controller"; import * as SimplePopups from "./simple-popups"; import * as EditTagsPopup from "./edit-tags-popup"; import * as ThemePicker from "./theme-picker"; +import { KEYMAP_LEGEND_TITLE } from "../../static/keymap/legend"; export let groups = {}; async function initGroups() { @@ -51,9 +52,11 @@ async function initGroups() { if (Config.keymapMode === "off") { $(".pageSettings .section.keymapStyle").addClass("hidden"); $(".pageSettings .section.keymapLayout").addClass("hidden"); + $(".pageSettings .section.keymapLegendStyle").addClass("hidden"); } else { $(".pageSettings .section.keymapStyle").removeClass("hidden"); $(".pageSettings .section.keymapLayout").removeClass("hidden"); + $(".pageSettings .section.keymapLegendStyle").removeClass("hidden"); } } ); @@ -65,6 +68,10 @@ async function initGroups() { "keymapLayout", UpdateConfig.setKeymapLayout ); + groups.keymapLegendStyle = new SettingsGroup( + KEYMAP_LEGEND_TITLE, + UpdateConfig.setKeymapLegendStyle + ); groups.showKeyTips = new SettingsGroup( "showKeyTips", UpdateConfig.setKeyTips, @@ -578,7 +585,9 @@ $( ".pageSettings .section.discordIntegration .buttons .generateCodeButton" ).click((e) => { Loader.show(); - CloudFunctions.generatePairingCode({ uid: firebase.auth().currentUser.uid }) + CloudFunctions.generatePairingCode({ + uid: firebase.auth().currentUser.uid, + }) .then((ret) => { Loader.hide(); if (ret.data.status === 1 || ret.data.status === 2) { @@ -715,7 +724,9 @@ $(".pageSettings .sectionGroupTitle").click((e) => { { duration: 250, step: function (now) { - $(this).css({ transform: "rotate(" + now + "deg)" }); + $(this).css({ + transform: "rotate(" + now + "deg)", + }); }, } ); @@ -729,7 +740,9 @@ $(".pageSettings .sectionGroupTitle").click((e) => { { duration: 250, step: function (now) { - $(this).css({ transform: "rotate(" + now + "deg)" }); + $(this).css({ + transform: "rotate(" + now + "deg)", + }); }, } ); From 29812fba219e7f783207c78dfd589402cc232cd6 Mon Sep 17 00:00:00 2001 From: seaerchin Date: Thu, 8 Apr 2021 00:07:24 +0800 Subject: [PATCH 04/20] feat(css/html): added css/html for keymap legend styling --- src/sass/style.scss | 3 +++ static/index.html | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/sass/style.scss b/src/sass/style.scss index cb650b3ae..17a39e57d 100644 --- a/src/sass/style.scss +++ b/src/sass/style.scss @@ -3041,6 +3041,7 @@ key { &.languageGroups, &.layout, &.keymapLayout, + &.keymapLegendStyle, &.fontFamily, &.funbox, &.keymapStyle, @@ -3553,6 +3554,7 @@ key { .pageSettings .section.language .buttons, .pageSettings .section.layout .buttons, .pageSettings .section.keymapLayout .buttons, + .pageSettings .section.keymapLegendStyle .buttons, .pageSettings .section.fontFamily .buttons, .pageSettings .section.funbox .buttons, .pageSettings .section.keymapStyle .buttons { @@ -3663,6 +3665,7 @@ key { .pageSettings .section.language .buttons, .pageSettings .section.layout .buttons, .pageSettings .section.keymapLayout .buttons, + .pageSettings .section.keymapLegendStyle .buttons, .pageSettings .section.fontFamily .buttons, .pageSettings .section.funbox .buttons, .pageSettings .section.keymapStyle .buttons { diff --git a/static/index.html b/static/index.html index 7274cd36c..011cc7807 100644 --- a/static/index.html +++ b/static/index.html @@ -2769,6 +2769,35 @@ +
+

keymap legend style

+
+
+ lowercase +
+
+ UPPERCASE +
+
+   +
+
+

keymap layout

From ecc3902a6ab7f1027533f6aeb92a6d4e61bac94a Mon Sep 17 00:00:00 2001 From: seaerchin Date: Thu, 8 Apr 2021 00:31:23 +0800 Subject: [PATCH 05/20] refactor(settings-group): minor refactor to make it cleaner --- src/js/settings/settings-group.js | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/js/settings/settings-group.js b/src/js/settings/settings-group.js index 50226bc50..13ce7cd44 100644 --- a/src/js/settings/settings-group.js +++ b/src/js/settings/settings-group.js @@ -9,11 +9,7 @@ export default class SettingsGroup { ) { this.configName = configName; this.configValue = Config[configName]; - if (this.configValue === true || this.configValue === false) { - this.onOff = true; - } else { - this.onOff = false; - } + this.onOff = typeof this.configValue === "boolean"; this.toggleFunction = toggleFunction; this.setCallback = setCallback; this.updateCallback = updateCallback; @@ -36,8 +32,8 @@ export default class SettingsGroup { this.updateButton(); if (this.setCallback !== null) this.setCallback(); } else { - let value = target.attr(configName); - let params = target.attr("params"); + const value = target.attr(configName); + const params = target.attr("params"); this.setValue(value, params); } } @@ -60,14 +56,9 @@ export default class SettingsGroup { "active" ); if (this.onOff) { - let onoffstring; - if (this.configValue) { - onoffstring = "on"; - } else { - onoffstring = "off"; - } + const onOffString = this.configvalue ? "on" : "off"; $( - `.pageSettings .section.${this.configName} .buttons .button.${onoffstring}` + `.pageSettings .section.${this.configName} .buttons .button.${onOffString}` ).addClass("active"); } else { $( From 795f695d885a3d72590384f067688aca12917aca Mon Sep 17 00:00:00 2001 From: seaerchin Date: Thu, 8 Apr 2021 01:08:06 +0800 Subject: [PATCH 06/20] fix(config): fixed setting keymap legends --- src/js/config.js | 24 ++++++++++-------------- static/index.html | 6 +++--- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/js/config.js b/src/js/config.js index d75dca891..5d6eefb90 100644 --- a/src/js/config.js +++ b/src/js/config.js @@ -87,8 +87,8 @@ let defaultConfig = { showAllLines: false, keymapMode: "off", keymapStyle: "staggered", - keymapLayout: "qwerty", keymapLegendStyle: "lowercase", + keymapLayout: "qwerty", fontFamily: "Roboto_Mono", smoothLineScroll: false, alwaysShowDecimalPlaces: false, @@ -1266,15 +1266,18 @@ export function setKeymapMode(mode, nosave) { if (!nosave) saveToCookie(); } -export function setKeymapLegendStyle(style = "lowercase", shouldSave = true) { +export function setKeymapLegendStyle(style, nosave) { // Remove existing styles keymapLegendStyles.forEach(({ name }) => { $(".keymapLegendStyle").removeClass(name); }); - // Save to cookie for persistence + style = style || "lowercase"; + + // Update and save to cookie for persistence + $(".keymapLegendStyle").addClass(style); config.keymapLegendStyle = style; - if (shouldSave) saveToCookie(); + if (!nosave) saveToCookie(); } export function setKeymapStyle(style, nosave) { @@ -1282,17 +1285,9 @@ export function setKeymapStyle(style, nosave) { $(".keymap").removeClass("split"); $(".keymap").removeClass("split_matrix"); - if (style == null || style == undefined) { - style = "staggered"; - } + style = style || "staggered"; - if (style === "matrix") { - $(".keymap").addClass("matrix"); - } else if (style === "split") { - $(".keymap").addClass("split"); - } else if (style === "split_matrix") { - $(".keymap").addClass("split_matrix"); - } + $(".keymap").addClass(style); config.keymapStyle = style; if (!nosave) saveToCookie(); } @@ -1444,6 +1439,7 @@ export function apply(configObj) { setTimerOpacity(configObj.timerOpacity, true); setKeymapMode(configObj.keymapMode, true); setKeymapStyle(configObj.keymapStyle, true); + setKeymapLegendStyle(configObj.keymapLegendStyle, true); setKeymapLayout(configObj.keymapLayout, true); setFontFamily(configObj.fontFamily, true); setSmoothCaret(configObj.smoothCaret, true); diff --git a/static/index.html b/static/index.html index 011cc7807..f747c53fd 100644 --- a/static/index.html +++ b/static/index.html @@ -2774,7 +2774,7 @@
@@ -2782,7 +2782,7 @@
@@ -2790,7 +2790,7 @@
From 1e05a20d230249718215f5e8217e028e7edf4531 Mon Sep 17 00:00:00 2001 From: seaerchin Date: Thu, 8 Apr 2021 02:47:47 +0800 Subject: [PATCH 07/20] feat(config): adds dom manipulation to config to update keymap --- src/js/config.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/js/config.js b/src/js/config.js index 5d6eefb90..e758909be 100644 --- a/src/js/config.js +++ b/src/js/config.js @@ -1274,6 +1274,19 @@ export function setKeymapLegendStyle(style, nosave) { style = style || "lowercase"; + // Mutate the keymap in the DOM, if it exists. + // 1. Remove everything + $(".keymap-key > .letter").css("display", ""); + $(".keymap-key > .letter").css("text-transform", ""); + + // 2. Append special styles onto the DOM elements + if (style === "uppercase") { + $(".keymap-key > .letter").css("text-transform", "capitalize"); + } + if (style === "blank") { + $(".keymap-key > .letter").css("display", "none"); + } + // Update and save to cookie for persistence $(".keymapLegendStyle").addClass(style); config.keymapLegendStyle = style; @@ -1281,10 +1294,10 @@ export function setKeymapLegendStyle(style, nosave) { } export function setKeymapStyle(style, nosave) { + console.log("keymap style", style); $(".keymap").removeClass("matrix"); $(".keymap").removeClass("split"); $(".keymap").removeClass("split_matrix"); - style = style || "staggered"; $(".keymap").addClass(style); From 30ca2a8a629f9db7a8a6e2da081bdaffe294a4ca Mon Sep 17 00:00:00 2001 From: seaerchin Date: Thu, 8 Apr 2021 03:13:24 +0800 Subject: [PATCH 08/20] refactor(config): updated config/statics to be clearer --- src/js/config.js | 10 +++++----- static/keymap/legend/_list.json | 17 +++++------------ 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/js/config.js b/src/js/config.js index e758909be..075f0bd79 100644 --- a/src/js/config.js +++ b/src/js/config.js @@ -87,7 +87,7 @@ let defaultConfig = { showAllLines: false, keymapMode: "off", keymapStyle: "staggered", - keymapLegendStyle: "lowercase", + keymapLegendStyle: keymapLegendStyles.lowercase, keymapLayout: "qwerty", fontFamily: "Roboto_Mono", smoothLineScroll: false, @@ -1268,11 +1268,11 @@ export function setKeymapMode(mode, nosave) { export function setKeymapLegendStyle(style, nosave) { // Remove existing styles - keymapLegendStyles.forEach(({ name }) => { + Object.keys(keymapLegendStyles).forEach((name) => { $(".keymapLegendStyle").removeClass(name); }); - style = style || "lowercase"; + style = style || keymapLegendStyles.lowercase; // Mutate the keymap in the DOM, if it exists. // 1. Remove everything @@ -1280,10 +1280,10 @@ export function setKeymapLegendStyle(style, nosave) { $(".keymap-key > .letter").css("text-transform", ""); // 2. Append special styles onto the DOM elements - if (style === "uppercase") { + if (style === keymapLegendStyles.uppercase) { $(".keymap-key > .letter").css("text-transform", "capitalize"); } - if (style === "blank") { + if (style === keymapLegendStyles.blank) { $(".keymap-key > .letter").css("display", "none"); } diff --git a/static/keymap/legend/_list.json b/static/keymap/legend/_list.json index 573f0ef20..874cf7b0b 100644 --- a/static/keymap/legend/_list.json +++ b/static/keymap/legend/_list.json @@ -1,12 +1,5 @@ -[ - { - "name": "lowercase" - }, - { - "name": "UPPERCASE" - }, - { - "name": "blank" - } - ] - \ No newline at end of file +{ + "lowercase": "lowercase", + "uppercase": "uppercase", + "blank": "blank" +} \ No newline at end of file From 33429969d5fadd2ada8a25315f00c025ced89dfd Mon Sep 17 00:00:00 2001 From: seaerchin Date: Thu, 8 Apr 2021 03:22:44 +0800 Subject: [PATCH 09/20] feat(commandline): adds toggling for keymaps legend on cli --- src/js/commandline-lists.js | 38 +++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/js/commandline-lists.js b/src/js/commandline-lists.js index ed2da742a..4d7992a9d 100644 --- a/src/js/commandline-lists.js +++ b/src/js/commandline-lists.js @@ -15,6 +15,7 @@ import * as Funbox from "./funbox"; import * as TagController from "./tag-controller"; import * as Commandline from "./commandline"; import * as CustomText from "./custom-text"; +import { keymapLegendStyles } from "../../static/keymap/legend"; export let current = []; @@ -647,6 +648,33 @@ let commandsKeymapStyle = { ], }; +let commandsKeymapLegendStyle = { + title: "Change keymap legend style...", + list: [ + { + id: "setKeymapLegendStyleLowercase", + display: keymapLegendStyles.lowercase, + exec: () => { + UpdateConfig.setKeymapLegendStyle(keymapLegendStyles.lowercase); + }, + }, + { + id: "setKeymapLegendStyleUppercase", + display: keymapLegendStyles.uppercase, + exec: () => { + UpdateConfig.setKeymapLegendStyle(keymapLegendStyles.uppercase); + }, + }, + { + id: "setKeymapLegendStyleBlank", + display: keymapLegendStyles.blank, + exec: () => { + UpdateConfig.setKeymapLegendStyle(keymapLegendStyles.blank); + }, + }, + ], +}; + let commandsHighlightMode = { title: "Change highlight mode...", list: [ @@ -1678,6 +1706,16 @@ export let defaultCommands = { Commandline.show(); }, }, + { + id: "changeKeymapLegendStyle", + display: "Change keymap legend style...", + alias: "keyboard", + subgroup: true, + exec: () => { + current.push(commandsKeymapLegendStyle); + Commandline.show(); + }, + }, { id: "changeKeymapLayout", display: "Change keymap layout...", From a703a7123a3ef7d1c32948eaf41cd0e747d8a6df Mon Sep 17 00:00:00 2001 From: seaerchin Date: Fri, 9 Apr 2021 13:30:50 +0800 Subject: [PATCH 10/20] fix(config): changed extra console log and html characters display --- src/js/config.js | 1 - static/index.html | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/js/config.js b/src/js/config.js index 075f0bd79..d252c8263 100644 --- a/src/js/config.js +++ b/src/js/config.js @@ -1294,7 +1294,6 @@ export function setKeymapLegendStyle(style, nosave) { } export function setKeymapStyle(style, nosave) { - console.log("keymap style", style); $(".keymap").removeClass("matrix"); $(".keymap").removeClass("split"); $(".keymap").removeClass("split_matrix"); diff --git a/static/index.html b/static/index.html index f747c53fd..ff59bdb36 100644 --- a/static/index.html +++ b/static/index.html @@ -2786,7 +2786,7 @@ tabindex="0" onclick="this.blur();" > - UPPERCASE + uppercase
-   + blank
From 74d6fe1ca170069ca7ef979f0c4ee2e28f2cb8c7 Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 9 Apr 2021 18:10:50 +0100 Subject: [PATCH 11/20] added mr robot quote --- static/quotes/english.json | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/static/quotes/english.json b/static/quotes/english.json index 9e67a9e06..8e730c4c9 100644 --- a/static/quotes/english.json +++ b/static/quotes/english.json @@ -1,22 +1,10 @@ { "language": "english", "groups": [ - [ - 0, - 100 - ], - [ - 101, - 300 - ], - [ - 301, - 600 - ], - [ - 601, - 9999 - ] + [0, 100], + [101, 300], + [301, 600], + [601, 9999] ], "quotes": [ { @@ -32614,6 +32602,12 @@ "source": "Fahrenheit 451", "length": 310, "id": 5484 + }, + { + "text": "My father picked me up from school one day and we played hookey and went to the beach. It was too cold to go in the water so we sat on a blanket and ate pizza. When I got home my sneakers were full of sand and I dumped it on my bedroom floor. I didn't know the difference, I was six. My mother screamed at me for the mess but he wasn't mad. He said that billions of years ago the world 's shifting and ocean moving brought that sand to that spot on the beach and then I took it away. Every day he said we change the world. Which is a nice thought until I think about how many days and lifetimes I would need to bring a shoe full of sand home until there is no beach. Until it made a difference to anyone. Every day we change the world. But to change the world in a way that means anything that takes more time than most people have. it never happens all at once. Its slow. Its methodical. Its exhausting. We don't all have the stomach for it.", + "source": "Mr. Robot", + "length": 942, + "id": 5485 } ] -} \ No newline at end of file +} From 773fb29dc712e1cdf2393acee88c39d4bcf7a1c4 Mon Sep 17 00:00:00 2001 From: CarinaChenot Date: Fri, 9 Apr 2021 20:19:21 +0100 Subject: [PATCH 12/20] Add .firebaserc_example back --- .firebaserc_example | 5 +++++ CONTRIBUTING.md | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .firebaserc_example diff --git a/.firebaserc_example b/.firebaserc_example new file mode 100644 index 000000000..5a98f50cf --- /dev/null +++ b/.firebaserc_example @@ -0,0 +1,5 @@ +{ + "projects": { + "default": "your-firebase-project-id" + } +} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8541cb6fb..9ce02dbc7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,7 +15,7 @@ 1. [Install the Firebase CLI](https://firebase.google.com/docs/cli) 1. Run `firebase login` on your terminal to log in to the same google account as you just used to create the project. 1. Git clone this project. -1. Rename `.firebaserc_example` to `.firebaserc` and change the project name of default to the firebase project id you just created. +1. Duplicate `.firebaserc_example`, rename the new file to `.firebaserc` and change the project name of default to the firebase project id you just created. - If `.firebaserc_example` does not exist after cloning, create your own with: @@ -48,7 +48,6 @@ - Start in test mode - Select default location and enable - ## Building and Running 1. Run `npm install` in the project root directory to install dependencies. From a6990cd369528e16d48dd622f9bf18a385d5fa9d Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 9 Apr 2021 21:22:27 +0100 Subject: [PATCH 13/20] fixed test config jumping up and down at certain zoom levels --- src/sass/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sass/style.scss b/src/sass/style.scss index cb650b3ae..b63d24f56 100644 --- a/src/sass/style.scss +++ b/src/sass/style.scss @@ -1652,7 +1652,7 @@ a:hover { justify-self: right; display: grid; // grid-auto-flow: row; - grid-template-rows: 1fr 1fr 1fr; + grid-template-rows: 0.7rem 0.7rem 0.7rem; grid-gap: 0.2rem; // width: min-content; // width: -moz-min-content; From 1576d9f36f6401d36e1782e91d3741a45e577174 Mon Sep 17 00:00:00 2001 From: Maclogger <31780197+Maclogger@users.noreply.github.com> Date: Fri, 9 Apr 2021 22:26:50 +0200 Subject: [PATCH 14/20] Adding "slovak_1k.json" --- static/languages/slovak_1k.json | 1007 +++++++++++++++++++++++++++++++ 1 file changed, 1007 insertions(+) create mode 100644 static/languages/slovak_1k.json diff --git a/static/languages/slovak_1k.json b/static/languages/slovak_1k.json new file mode 100644 index 000000000..22dbf7ed1 --- /dev/null +++ b/static/languages/slovak_1k.json @@ -0,0 +1,1007 @@ +{ + "name": "slovak_1k", + "leftToRight": true, + "words": [ + "to", + "sa", + "je", + "si", + "a", + "som", + "na", + "že", + "čo", + "nie", + "v", + "ako", + "tak", + "ale", + "by", + "s", + "tu", + "mi", + "do", + "ja", + "o", + "sme", + "áno", + "ste", + "ma", + "z", + "už", + "len", + "ty", + "ho", + "ti", + "aby", + "dobre", + "keď", + "za", + "ťa", + "ak", + "tam", + "sú", + "pre", + "bol", + "hej", + "toto", + "teraz", + "niečo", + "prečo", + "no", + "mám", + "aj", + "ich", + "byť", + "ten", + "bude", + "všetko", + "vás", + "kde", + "ju", + "nič", + "ešte", + "vám", + "kto", + "tom", + "po", + "máš", + "k", + "môj", + "toho", + "bolo", + "prosím", + "alebo", + "vieš", + "myslím", + "má", + "takže", + "mňa", + "veľmi", + "bola", + "poriadku", + "nikdy", + "tým", + "jeho", + "viem", + "nás", + "ani", + "jej", + "mal", + "od", + "chcem", + "potom", + "ďakujem", + "so", + "možno", + "mu", + "neviem", + "povedal", + "oh", + "vy", + "teba", + "chceš", + "ísť", + "on", + "pane", + "ahoj", + "stále", + "viac", + "tie", + "pán", + "naozaj", + "nám", + "pretože", + "sem", + "máme", + "dnes", + "poďme", + "povedať", + "moja", + "poď", + "boli", + "musím", + "pozri", + "pred", + "môžem", + "vo", + "ok", + "budem", + "iba", + "všetci", + "myslíš", + "keby", + "niekto", + "tiež", + "ktorý", + "mali", + "nemôžem", + "moje", + "my", + "práve", + "bože", + "tú", + "asi", + "rád", + "či", + "čas", + "vždy", + "deň", + "tvoj", + "máte", + "mať", + "dobrý", + "tomu", + "veľa", + "jeden", + "ktoré", + "tá", + "trochu", + "ľudia", + "stalo", + "pri", + "jasné", + "otec", + "chcel", + "kurva", + "tento", + "zo", + "musíme", + "mohol", + "budeš", + "bez", + "mala", + "ide", + "mnou", + "až", + "dobré", + "môžeš", + "život", + "robiť", + "veci", + "mne", + "tebou", + "teda", + "presne", + "robíš", + "dosť", + "daj", + "môže", + "však", + "choď", + "nech", + "viete", + "musíš", + "ľudí", + "domov", + "nikto", + "všetky", + "prepáčte", + "ona", + "prepáč", + "preto", + "späť", + "povedz", + "deje", + "budeme", + "raz", + "každý", + "hneď", + "im", + "kým", + "urobiť", + "tvoja", + "lebo", + "vážne", + "rokov", + "nechcem", + "kedy", + "svoje", + "vďaka", + "vedieť", + "počkaj", + "noc", + "vec", + "také", + "kvôli", + "nejaké", + "takto", + "nemám", + "idem", + "svoju", + "kam", + "pravdu", + "videl", + "myslel", + "chce", + "povedala", + "než", + "pár", + "žiadne", + "vôbec", + "preč", + "samozrejme", + "ním", + "mohli", + "tvoje", + "miesto", + "problém", + "mama", + "vlastne", + "potrebujem", + "peniaze", + "lepšie", + "tebe", + "chcete", + "niekedy", + "rýchlo", + "musí", + "spolu", + "ideme", + "sám", + "u", + "vidieť", + "celý", + "tej", + "úplne", + "deti", + "prišiel", + "určite", + "taký", + "von", + "pod", + "večer", + "tých", + "vyzerá", + "dlho", + "pani", + "ráno", + "fajn", + "koľko", + "veď", + "seba", + "dva", + "aký", + "môžeme", + "nich", + "aké", + "všetkých", + "tri", + "príliš", + "dievča", + "rada", + "urobil", + "majú", + "pravda", + "hovoriť", + "meno", + "dostať", + "ktorá", + "budú", + "váš", + "cez", + "čom", + "môjho", + "pozor", + "zajtra", + "tieto", + "pomôcť", + "prestaň", + "mojej", + "nejaký", + "muž", + "nebude", + "riti", + "super", + "dole", + "tejto", + "niekoho", + "neho", + "žena", + "ano", + "svoj", + "dieťa", + "hore", + "môžete", + "správne", + "co", + "fakt", + "vaše", + "vidím", + "radšej", + "znamená", + "auto", + "dať", + "istý", + "jedno", + "oni", + "medzi", + "ďalej", + "pozrite", + "ku", + "hovorí", + "predtým", + "budete", + "moju", + "poviem", + "chvíľu", + "nechaj", + "nebol", + "zlatko", + "mami", + "páči", + "náš", + "chcela", + "proste", + "i", + "túto", + "ľúto", + "mohla", + "naše", + "nemôžeš", + "dostal", + "podľa", + "jedna", + "vie", + "táto", + "myslíte", + "jednu", + "pohode", + "neskôr", + "robí", + "aspoň", + "nej", + "dve", + "dal", + "nájsť", + "tomto", + "skoro", + "prácu", + "človek", + "vaša", + "vedel", + "nuž", + "ktorí", + "hovorím", + "haló", + "pomoc", + "nami", + "prvý", + "pekla", + "milujem", + "odtiaľto", + "nad", + "ideš", + "počúvaj", + "hovoril", + "vidíš", + "skôr", + "dúfam", + "čože", + "doma", + "ktorú", + "proti", + "okej", + "zlé", + "skutočne", + "veľký", + "vami", + "dvere", + "predsa", + "počul", + "koho", + "nemá", + "iné", + "pekne", + "minút", + "musíte", + "ňou", + "och", + "nemal", + "číslo", + "dobrá", + "uvidíme", + "hovoríš", + "svojho", + "malý", + "doktor", + "slečna", + "kámo", + "taká", + "buď", + "chlapci", + "okolo", + "nemáš", + "dom", + "znova", + "mŕtvy", + "ze", + "koniec", + "sakra", + "dám", + "zabiť", + "pokiaľ", + "moc", + "noci", + "sebe", + "dobrú", + "poďte", + "dnu", + "svete", + "svet", + "jedného", + "nemôže", + "dvaja", + "tvoju", + "volá", + "tí", + "the", + "dajte", + "myslela", + "života", + "ruky", + "páni", + "nebudem", + "príde", + "videla", + "celkom", + "sama", + "prišli", + "drž", + "matka", + "vonku", + "nebolo", + "zabil", + "našiel", + "cítim", + "chlapec", + "skvelé", + "vrátiť", + "zdá", + "boh", + "práca", + "sebou", + "problémy", + "syn", + "celé", + "otca", + "pekné", + "nápad", + "spraviť", + "priateľ", + "zase", + "chlap", + "roky", + "najlepšie", + "času", + "ach", + "svojej", + "rok", + "musel", + "zbraň", + "oci", + "niekde", + "potrebujeme", + "odísť", + "musieť", + "krát", + "vtedy", + "kapitán", + "žiadny", + "žiť", + "tohto", + "kúpiť", + "ňu", + "dokonca", + "inak", + "práce", + "poznám", + "ó", + "pozrieť", + "čím", + "zlato", + "hlavu", + "človeče", + "nemyslím", + "ceste", + "stane", + "nebola", + "robím", + "nemáme", + "robíte", + "počkajte", + "uh", + "nový", + "eur", + "celú", + "dá", + "ticho", + "nechať", + "brat", + "veľké", + "zatiaľ", + "ňom", + "chlape", + "znovu", + "ženy", + "cestu", + "pripravený", + "týždeň", + "počkať", + "hrať", + "oči", + "chlapče", + "tvojej", + "prísť", + "nechceš", + "povedali", + "choďte", + "iste", + "čokoľvek", + "ďalší", + "prišla", + "možné", + "toľko", + "chcú", + "pôjdem", + "zle", + "včera", + "našli", + "konečne", + "aká", + "slovo", + "malé", + "pocit", + "priamo", + "ťažké", + "nimi", + "pekná", + "ženu", + "okrem", + "nové", + "ocko", + "naša", + "hodín", + "starý", + "iný", + "chceli", + "videli", + "spravil", + "mojich", + "mojom", + "nejakú", + "týchto", + "odkiaľ", + "nevieš", + "neskoro", + "ta", + "výborne", + "prípade", + "nechajte", + "telo", + "nepovedal", + "svojich", + "srdce", + "päť", + "nemôžeme", + "istá", + "dní", + "živote", + "nevidel", + "robil", + "jednoducho", + "smrť", + "majster", + "volám", + "dôvod", + "potrebuje", + "vyzeráš", + "domu", + "dr", + "povedzte", + "isté", + "dni", + "neboj", + "môžu", + "dôležité", + "muža", + "jediný", + "príbeh", + "tvojho", + "treba", + "znie", + "aha", + "mieste", + "porozprávať", + "akoby", + "ruku", + "dvoch", + "vašu", + "ďaleko", + "nechcel", + "rozumiem", + "ono", + "vecí", + "všetkým", + "mimo", + "počas", + "loď", + "hubu", + "najlepší", + "vypadni", + "dostali", + "školy", + "šancu", + "urobím", + "rodina", + "priatelia", + "šťastie", + "zdravím", + "mesto", + "žiadna", + "myslí", + "pravdepodobne", + "pekný", + "týmto", + "nikoho", + "poznáš", + "našej", + "mohlo", + "zem", + "malo", + "láska", + "smrti", + "titulky", + "krv", + "vieme", + "potrebuješ", + "zlý", + "strach", + "nemohol", + "mesta", + "najprv", + "hodiny", + "vedela", + "urobila", + "plán", + "spať", + "stačí", + "jedlo", + "dome", + "sestra", + "veriť", + "začal", + "moji", + "našich", + "chyba", + "sveta", + "vziať", + "dievčatá", + "nevedel", + "zemi", + "zavolať", + "nemali", + "spôsob", + "štyri", + "dňa", + "opäť", + "zostať", + "nevie", + "úžasné", + "ukáž", + "telefón", + "všade", + "auta", + "pôjdeme", + "žiaden", + "ktorej", + "ďalšie", + "nerob", + "hmm", + "počuť", + "chlapík", + "vráť", + "pracovať", + "film", + "syna", + "čau", + "zober", + "madam", + "čoskoro", + "dámy", + "cesty", + "pamätáš", + "miláčik", + "roku", + "nechal", + "strane", + "tou", + "snáď", + "naspäť", + "jasne", + "bež", + "byt", + "ktorého", + "potrebovať", + "zavolám", + "urob", + "ha", + "t", + "urobili", + "ktorých", + "prachy", + "malá", + "pána", + "vašej", + "vidíte", + "povieš", + "priateľov", + "you", + "robia", + "akú", + "šťastný", + "chápem", + "poriadne", + "rokmi", + "ne", + "veľká", + "nechce", + "zomrel", + "okamžite", + "tvár", + "zbohom", + "jediná", + "rozprávať", + "našu", + "nemáte", + "mrzí", + "išiel", + "muži", + "začať", + "nemala", + "nemusíš", + "ked", + "obaja", + "dala", + "oveľa", + "časť", + "nakoniec", + "radi", + "mysli", + "kamoš", + "chceme", + "rodinu", + "škole", + "niekoľko", + "nemôžete", + "uveriť", + "počúvajte", + "nehovor", + "zastaviť", + "pol", + "vrátim", + "párty", + "rovnako", + "snažím", + "práci", + "zmysel", + "baby", + "otvor", + "odtiaľ", + "tými", + "dali", + "cesta", + "boha", + "pohyb", + "zavolaj", + "myslieť", + "odo", + "meste", + "slová", + "nohy", + "stať", + "blázon", + "odišiel", + "skutočnosti", + "peňazí", + "vravel", + "chcieť", + "hovoria", + "napríklad", + "vezmi", + "počula", + "zobrať", + "hlavy", + "ah", + "nášho", + "žije", + "vezmem", + "každého", + "strašne", + "polícia", + "zbrane", + "verím", + "nebudeš", + "sľubujem", + "blízko", + "prípad", + "hodinu", + "mužov", + "čoho", + "volal", + "sen", + "nejde", + "prichádza", + "stratil", + "začína", + "správy", + "menej", + "takmer", + "maj", + "trocha", + "dostala", + "posledný", + "čakať", + "zostaň", + "čaká", + "musia", + "mesiac", + "okay", + "trošku", + "prvé", + "dostanem", + "vášho", + "druhý", + "predstaviť", + "počuj", + "nejako", + "vnútri", + "náhodou", + "musela", + "pomôž", + "šesť", + "vrátil", + "chvíľku", + "zabudol", + "neboli", + "hovno", + "čase", + "hovorila", + "dávno", + "chlapi", + "človeka", + "šťastia", + "nikomu", + "pes", + "každú", + "tvojom", + "mojou", + "stará", + "hovor", + "ver", + "jednej", + "pokoj", + "prídem", + "rovno", + "rodičia", + "dolu", + "počuješ", + "nejaká", + "šaty", + "ježiši", + "skvelý", + "dcéra", + "stojí", + "večeru", + "miesta", + "naposledy", + "mnoho", + "drahá", + "hm", + "nevadí", + "urobíme", + "spoločnosť", + "dáš", + "bojovať", + "tvojich", + "vlasy", + "sex", + "chodiť", + "hovoríte", + "iného", + "stáť", + "hra", + "rozumieš", + "com", + "pomaly", + "dostane", + "cítiš", + "zabijem", + "často", + "vitajte", + "stretnúť", + "prisahám", + "prvá", + "aute", + "možnosť", + "srandu", + "desať", + "jediné", + "našla", + "žiadnu", + "obchod", + "otázka", + "posledné", + "hlavne", + "čerta", + "celá", + "strýko", + "vedeli", + "idú", + "rodiny", + "svojom", + "ukázať", + "najskôr", + "ľuďom", + "kávu", + "pozrime", + "milé", + "kľud", + "idiot", + "skús", + "moment", + "odkedy", + "navždy", + "záleží", + "pôjdeš", + "zomrieť", + "prestaňte", + "nerozumiem", + "hlas", + "vodu", + "jesť", + "poznáte", + "odpoveď", + "takú", + "právo", + "vzal", + "počuli", + "krásne", + "mladý", + "existuje", + "druhej", + "povie", + "dávaj", + "svetlo", + "poslal", + "zmeniť", + "mesiacov", + "zabudni", + "wow", + "ťažko", + "šiel", + "týždne", + "mimochodom", + "sadni" + ] +} \ No newline at end of file From 8b7880cddca67e15e93a6781739be3ed69c304c6 Mon Sep 17 00:00:00 2001 From: Maclogger <31780197+Maclogger@users.noreply.github.com> Date: Fri, 9 Apr 2021 22:27:36 +0200 Subject: [PATCH 15/20] Adding "slovak_1k" to _groups.json --- static/languages/_groups.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/languages/_groups.json b/static/languages/_groups.json index 31b727ad4..cd989c4c2 100644 --- a/static/languages/_groups.json +++ b/static/languages/_groups.json @@ -65,7 +65,7 @@ }, { "name": "slovak", - "languages": ["slovak"] + "languages": ["slovak", "slovak_1k"] }, { "name": "slovenian", From 0cb3b4c8756c49ffdf1c9198b5e92f54536d61e2 Mon Sep 17 00:00:00 2001 From: Maclogger <31780197+Maclogger@users.noreply.github.com> Date: Fri, 9 Apr 2021 22:28:16 +0200 Subject: [PATCH 16/20] Adding "slovak_1k" to _list.json --- static/languages/_list.json | 1 + 1 file changed, 1 insertion(+) diff --git a/static/languages/_list.json b/static/languages/_list.json index 83d7b9810..a6c24fc70 100644 --- a/static/languages/_list.json +++ b/static/languages/_list.json @@ -37,6 +37,7 @@ ,"czech_1k" ,"czech_10k" ,"slovak" + ,"slovak_1k" ,"slovenian" ,"croatian" ,"dutch" From e44a6e4fcb451b7537604c1866b942842050cc51 Mon Sep 17 00:00:00 2001 From: seaerchin Date: Sat, 10 Apr 2021 14:15:33 +0800 Subject: [PATCH 17/20] refactor(static): removed keymap static files and associated imports --- src/js/commandline-lists.js | 13 ++++++------- src/js/config.js | 12 ++++++------ src/js/settings.js | 3 +-- static/keymap/legend/_list.json | 5 ----- static/keymap/legend/index.js | 2 -- 5 files changed, 13 insertions(+), 22 deletions(-) delete mode 100644 static/keymap/legend/_list.json delete mode 100644 static/keymap/legend/index.js diff --git a/src/js/commandline-lists.js b/src/js/commandline-lists.js index 4d7992a9d..988d1c124 100644 --- a/src/js/commandline-lists.js +++ b/src/js/commandline-lists.js @@ -15,7 +15,6 @@ import * as Funbox from "./funbox"; import * as TagController from "./tag-controller"; import * as Commandline from "./commandline"; import * as CustomText from "./custom-text"; -import { keymapLegendStyles } from "../../static/keymap/legend"; export let current = []; @@ -653,23 +652,23 @@ let commandsKeymapLegendStyle = { list: [ { id: "setKeymapLegendStyleLowercase", - display: keymapLegendStyles.lowercase, + display: "lowercase", exec: () => { - UpdateConfig.setKeymapLegendStyle(keymapLegendStyles.lowercase); + UpdateConfig.setKeymapLegendStyle("lowercase"); }, }, { id: "setKeymapLegendStyleUppercase", - display: keymapLegendStyles.uppercase, + display: "uppercase", exec: () => { - UpdateConfig.setKeymapLegendStyle(keymapLegendStyles.uppercase); + UpdateConfig.setKeymapLegendStyle("uppercase"); }, }, { id: "setKeymapLegendStyleBlank", - display: keymapLegendStyles.blank, + display: "blank", exec: () => { - UpdateConfig.setKeymapLegendStyle(keymapLegendStyles.blank); + UpdateConfig.setKeymapLegendStyle("blank"); }, }, ], diff --git a/src/js/config.js b/src/js/config.js index d252c8263..f48be2055 100644 --- a/src/js/config.js +++ b/src/js/config.js @@ -17,7 +17,6 @@ import * as PaceCaret from "./pace-caret"; import * as UI from "./ui"; import * as CommandlineLists from "./commandline-lists"; import * as BackgroundFilter from "./custom-background-filter"; -import keymapLegendStyles from "../../static/keymap/legend/_list.json"; export let cookieConfig = null; export let dbConfigLoaded = false; @@ -87,7 +86,7 @@ let defaultConfig = { showAllLines: false, keymapMode: "off", keymapStyle: "staggered", - keymapLegendStyle: keymapLegendStyles.lowercase, + keymapLegendStyle: "lowercase", keymapLayout: "qwerty", fontFamily: "Roboto_Mono", smoothLineScroll: false, @@ -1268,11 +1267,12 @@ export function setKeymapMode(mode, nosave) { export function setKeymapLegendStyle(style, nosave) { // Remove existing styles - Object.keys(keymapLegendStyles).forEach((name) => { + const keymapLegendStyles = ["lowercase", "uppercase", "blank"]; + keymapLegendStyles.forEach((name) => { $(".keymapLegendStyle").removeClass(name); }); - style = style || keymapLegendStyles.lowercase; + style = style || "lowercase"; // Mutate the keymap in the DOM, if it exists. // 1. Remove everything @@ -1280,10 +1280,10 @@ export function setKeymapLegendStyle(style, nosave) { $(".keymap-key > .letter").css("text-transform", ""); // 2. Append special styles onto the DOM elements - if (style === keymapLegendStyles.uppercase) { + if (style === "uppercase") { $(".keymap-key > .letter").css("text-transform", "capitalize"); } - if (style === keymapLegendStyles.blank) { + if (style === "blank") { $(".keymap-key > .letter").css("display", "none"); } diff --git a/src/js/settings.js b/src/js/settings.js index fb7c6e5d1..c542befb8 100644 --- a/src/js/settings.js +++ b/src/js/settings.js @@ -13,7 +13,6 @@ import * as TagController from "./tag-controller"; import * as SimplePopups from "./simple-popups"; import * as EditTagsPopup from "./edit-tags-popup"; import * as ThemePicker from "./theme-picker"; -import { KEYMAP_LEGEND_TITLE } from "../../static/keymap/legend"; export let groups = {}; async function initGroups() { @@ -69,7 +68,7 @@ async function initGroups() { UpdateConfig.setKeymapLayout ); groups.keymapLegendStyle = new SettingsGroup( - KEYMAP_LEGEND_TITLE, + "keymapLegendStyle", UpdateConfig.setKeymapLegendStyle ); groups.showKeyTips = new SettingsGroup( diff --git a/static/keymap/legend/_list.json b/static/keymap/legend/_list.json deleted file mode 100644 index 874cf7b0b..000000000 --- a/static/keymap/legend/_list.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "lowercase": "lowercase", - "uppercase": "uppercase", - "blank": "blank" -} \ No newline at end of file diff --git a/static/keymap/legend/index.js b/static/keymap/legend/index.js deleted file mode 100644 index 3c3db597f..000000000 --- a/static/keymap/legend/index.js +++ /dev/null @@ -1,2 +0,0 @@ -export * as keymapLegendStyles from "./_list.json"; -export const KEYMAP_LEGEND_TITLE = "keymapLegendStyle"; From 449dbd3b9d883e678a0d2442bffb595fadf26f9d Mon Sep 17 00:00:00 2001 From: CrumblyLiquid Date: Sat, 10 Apr 2021 10:50:10 +0200 Subject: [PATCH 18/20] Disables pb caret when not signed in Should satisfy ebe7f02593f47498bdea1f1dfe9e46594107b1f2 and closes #1161 --- src/js/config.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/js/config.js b/src/js/config.js index 975edf36b..c51d275d7 100644 --- a/src/js/config.js +++ b/src/js/config.js @@ -477,10 +477,12 @@ export function setPaceCaret(val, nosave) { if (val == undefined) { val = "off"; } - // if (val == "pb" && firebase.auth().currentUser === null) { - // Notifications.add("PB pace caret is unavailable without an account", 0); - // return; - // } + if ( document.readyState === "complete") { + if (val == "pb" && firebase.auth().currentUser === null) { + Notifications.add("PB pace caret is unavailable without an account", 0); + return; + } + } // if (config.mode === "zen" && val != "off") { // Notifications.add(`Can't use pace caret with zen mode.`, 0); // val = "off"; From 2206c12dbfe1f858fa3a849e1a36b4879b13f8f8 Mon Sep 17 00:00:00 2001 From: Miodec Date: Sat, 10 Apr 2021 19:54:15 +0100 Subject: [PATCH 19/20] added more patrons --- static/index.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/static/index.html b/static/index.html index 7bf8857ff..8e5a35bee 100644 --- a/static/index.html +++ b/static/index.html @@ -1660,6 +1660,20 @@
Robin
Sonicv6
Taran
+
Roux
+
Artem
+
DarkBlu
+
John
+
Gregory
+
Hopeless Love
+
Kalen
+
Ben
+
Jakub
+
Vincent
+
Connor
+
Zunaed
+
Emilio
+
Michael
From d1fdf3b2de19ea7f1602a3c8f5eb497253896378 Mon Sep 17 00:00:00 2001 From: Miodec Date: Sat, 10 Apr 2021 23:56:55 +0100 Subject: [PATCH 20/20] fixed a typo introduced in #1200 --- src/js/settings/settings-group.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/settings/settings-group.js b/src/js/settings/settings-group.js index 13ce7cd44..0c733c45f 100644 --- a/src/js/settings/settings-group.js +++ b/src/js/settings/settings-group.js @@ -56,7 +56,7 @@ export default class SettingsGroup { "active" ); if (this.onOff) { - const onOffString = this.configvalue ? "on" : "off"; + const onOffString = this.configValue ? "on" : "off"; $( `.pageSettings .section.${this.configName} .buttons .button.${onOffString}` ).addClass("active");