Merge pull request #8 from Miodec/master

merge
This commit is contained in:
UnrealApex 2021-04-12 17:34:58 -07:00 committed by GitHub
commit 1ad43a3432
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 730 additions and 208 deletions

View file

@ -65,11 +65,11 @@ export function getDataAndInit() {
CloudFunctions.removeSmallTests({ uid: user.uid });
}
if (!UpdateConfig.changedBeforeDb) {
if (Config.cookieConfig === null) {
if (Config.localStorageConfig === null) {
AccountButton.loading(false);
UpdateConfig.apply(DB.getSnapshot().config);
Settings.update();
UpdateConfig.saveToCookie(true);
UpdateConfig.saveToLocalStorage(true);
TestLogic.restart(false, true);
} else if (DB.getSnapshot().config !== undefined) {
//loading db config, keep for now
@ -112,7 +112,7 @@ export function getDataAndInit() {
AccountButton.loading(false);
UpdateConfig.apply(DB.getSnapshot().config);
Settings.update();
UpdateConfig.saveToCookie(true);
UpdateConfig.saveToLocalStorage(true);
TestLogic.restart(false, true);
}
}
@ -135,7 +135,7 @@ export function getDataAndInit() {
AccountButton.loading(false);
ResultFilters.updateTags();
CommandlineLists.updateTagCommands();
TagController.loadActiveFromCookie();
TagController.loadActiveFromLocalStorage();
ResultTagsPopup.updateButtons();
Settings.showAccountSection();
})

View file

@ -103,13 +103,13 @@ export function loadTags(tags) {
}
export function save() {
Misc.setCookie("resultFilters", JSON.stringify(filters), 365);
window.localStorage.setItem("resultFilters", JSON.stringify(filters));
}
export function load() {
// let newTags = $.cookie("activeTags");
try {
let newResultFilters = Misc.getCookie("resultFilters");
let newResultFilters = window.localStorage.getItem("resultFilters");
if (newResultFilters !== undefined && newResultFilters !== "") {
filters = JSON.parse(newResultFilters);
save();

View file

@ -198,7 +198,7 @@ export function updateTagCommands() {
tag.active = false;
});
TestUI.updateModesNotice();
TagController.saveActiveToCookie();
TagController.saveActiveToLocalStorage();
},
});

View file

@ -18,12 +18,12 @@ import * as UI from "./ui";
import * as CommandlineLists from "./commandline-lists";
import * as BackgroundFilter from "./custom-background-filter";
export let cookieConfig = null;
export let localStorageConfig = null;
export let dbConfigLoaded = false;
export let changedBeforeDb = false;
export function setCookieConfig(val) {
cookieConfig = val;
export function setLocalStorageConfig(val) {
localStorageConfig = val;
}
export function setDbConfigLoaded(val) {
@ -131,7 +131,7 @@ let config = {
...defaultConfig,
};
export async function saveToCookie(noDbCheck = false) {
export async function saveToLocalStorage(noDbCheck = false) {
if (!dbConfigLoaded && !noDbCheck) {
setChangedBeforeDb(true);
}
@ -143,7 +143,7 @@ export async function saveToCookie(noDbCheck = false) {
// });
let save = config;
delete save.resultFilters;
Misc.setCookie("config", JSON.stringify(save), 365);
window.localStorage.setItem("config", JSON.stringify(save));
// restartCount = 0;
if (!noDbCheck) await DB.saveConfig(save);
}
@ -159,7 +159,7 @@ export function setNumbers(numb, nosave) {
} else {
$("#top .config .numbersMode .text-button").addClass("active");
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleNumbers() {
@ -172,7 +172,7 @@ export function toggleNumbers() {
} else {
$("#top .config .numbersMode .text-button").removeClass("active");
}
saveToCookie();
saveToLocalStorage();
}
//punctuation
@ -186,7 +186,7 @@ export function setPunctuation(punc, nosave) {
} else {
$("#top .config .punctuationMode .text-button").addClass("active");
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function togglePunctuation() {
@ -199,7 +199,7 @@ export function togglePunctuation() {
} else {
$("#top .config .punctuationMode .text-button").removeClass("active");
}
saveToCookie();
saveToLocalStorage();
}
export function setMode(mode, nosave) {
@ -273,7 +273,7 @@ export function setMode(mode, nosave) {
}
// setPaceCaret("off", true);
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setPlaySoundOnError(val, nosave) {
@ -281,7 +281,7 @@ export function setPlaySoundOnError(val, nosave) {
val = false;
}
config.playSoundOnError = val;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setPlaySoundOnClick(val, nosave) {
@ -290,7 +290,7 @@ export function setPlaySoundOnClick(val, nosave) {
}
config.playSoundOnClick = val;
if (config.playSoundOnClick !== "off") Sound.init();
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function togglePlaySoundOnError() {
@ -311,14 +311,14 @@ export function setDifficulty(diff, nosave) {
config.difficulty = diff;
if (!nosave) TestLogic.restart(false, nosave);
TestUI.updateModesNotice();
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//set fav themes
export function setFavThemes(themes, nosave) {
config.favThemes = themes;
if (!nosave) {
saveToCookie();
saveToLocalStorage();
}
}
@ -330,7 +330,7 @@ export function toggleBlindMode() {
}
config.blindMode = blind;
TestUI.updateModesNotice();
saveToCookie();
saveToLocalStorage();
}
export function setBlindMode(blind, nosave) {
@ -339,7 +339,7 @@ export function setBlindMode(blind, nosave) {
}
config.blindMode = blind;
TestUI.updateModesNotice();
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
function updateChartAccuracy() {
@ -367,7 +367,7 @@ export function toggleChartAccuracy() {
config.chartAccuracy = true;
}
updateChartAccuracy();
saveToCookie();
saveToLocalStorage();
}
export function setChartAccuracy(chartAccuracy, nosave) {
@ -376,7 +376,7 @@ export function setChartAccuracy(chartAccuracy, nosave) {
}
config.chartAccuracy = chartAccuracy;
updateChartAccuracy();
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleChartStyle() {
@ -386,7 +386,7 @@ export function toggleChartStyle() {
config.chartStyle = "scatter";
}
updateChartStyle();
saveToCookie();
saveToLocalStorage();
}
export function setChartStyle(chartStyle, nosave) {
@ -395,7 +395,7 @@ export function setChartStyle(chartStyle, nosave) {
}
config.chartStyle = chartStyle;
updateChartStyle();
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setStopOnError(soe, nosave) {
@ -407,13 +407,13 @@ export function setStopOnError(soe, nosave) {
config.confidenceMode = "off";
}
TestUI.updateModesNotice();
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//alwaysshowdecimal
export function toggleAlwaysShowDecimalPlaces() {
config.alwaysShowDecimalPlaces = !config.alwaysShowDecimalPlaces;
saveToCookie();
saveToLocalStorage();
}
export function setAlwaysShowDecimalPlaces(val, nosave) {
@ -421,12 +421,12 @@ export function setAlwaysShowDecimalPlaces(val, nosave) {
val = false;
}
config.alwaysShowDecimalPlaces = val;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleAlwaysShowCPM() {
config.alwaysShowCPM = !config.alwaysShowCPM;
saveToCookie();
saveToLocalStorage();
}
export function setAlwaysShowCPM(val, nosave) {
@ -434,7 +434,7 @@ export function setAlwaysShowCPM(val, nosave) {
val = false;
}
config.alwaysShowCPM = val;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//show out of focus warning
@ -443,7 +443,7 @@ export function toggleShowOutOfFocusWarning() {
if (!config.showOutOfFocusWarning) {
OutOfFocus.hide();
}
saveToCookie();
saveToLocalStorage();
}
export function setShowOutOfFocusWarning(val, nosave) {
@ -454,13 +454,13 @@ export function setShowOutOfFocusWarning(val, nosave) {
if (!config.showOutOfFocusWarning) {
OutOfFocus.hide();
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//swap esc and tab
export function toggleSwapEscAndTab() {
config.swapEscAndTab = !config.swapEscAndTab;
saveToCookie();
saveToLocalStorage();
UI.updateKeytips();
}
@ -470,7 +470,7 @@ export function setSwapEscAndTab(val, nosave) {
}
config.swapEscAndTab = val;
UI.updateKeytips();
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//pace caret
@ -491,7 +491,7 @@ export function setPaceCaret(val, nosave) {
config.paceCaret = val;
TestUI.updateModesNotice();
PaceCaret.init(nosave);
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setPaceCaretCustomSpeed(val, nosave) {
@ -499,7 +499,7 @@ export function setPaceCaretCustomSpeed(val, nosave) {
val = 100;
}
config.paceCaretCustomSpeed = val;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//min wpm
@ -509,7 +509,7 @@ export function setMinWpm(minwpm, nosave) {
}
config.minWpm = minwpm;
TestUI.updateModesNotice();
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setMinWpmCustomSpeed(val, nosave) {
@ -517,7 +517,7 @@ export function setMinWpmCustomSpeed(val, nosave) {
val = 100;
}
config.minWpmCustomSpeed = val;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//min acc
@ -527,7 +527,7 @@ export function setMinAcc(min, nosave) {
}
config.minAcc = min;
TestUI.updateModesNotice();
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setMinAccCustom(val, nosave) {
@ -535,7 +535,7 @@ export function setMinAccCustom(val, nosave) {
val = 90;
}
config.minAccCustom = val;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//always show words history
@ -544,7 +544,7 @@ export function setAlwaysShowWordsHistory(val, nosave) {
val = false;
}
config.alwaysShowWordsHistory = val;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleAlwaysShowWordsHistory() {
@ -553,14 +553,14 @@ export function toggleAlwaysShowWordsHistory() {
val = false;
}
config.alwaysShowWordsHistory = val;
saveToCookie();
saveToLocalStorage();
}
//single list command line
export function setSingleListCommandLine(option, nosave) {
if (!option) option = "manual";
config.singleListCommandLine = option;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//show all lines
@ -571,7 +571,7 @@ export function toggleShowAllLines() {
}
config.showAllLines = sal;
TestLogic.restart();
saveToCookie();
saveToLocalStorage();
}
export function setShowAllLines(sal, nosave) {
@ -580,7 +580,7 @@ export function setShowAllLines(sal, nosave) {
}
config.showAllLines = sal;
if (!nosave) {
saveToCookie();
saveToLocalStorage();
TestLogic.restart();
}
}
@ -592,7 +592,7 @@ export function toggleQuickEnd() {
qe = false;
}
config.quickEnd = qe;
saveToCookie();
saveToLocalStorage();
}
export function setQuickEnd(qe, nosave) {
@ -600,7 +600,7 @@ export function setQuickEnd(qe, nosave) {
qe = false;
}
config.quickEnd = qe;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setEnableAds(val, nosave) {
@ -608,7 +608,7 @@ export function setEnableAds(val, nosave) {
val = "off";
}
config.enableAds = val;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setRepeatQuotes(val, nosave) {
@ -616,7 +616,7 @@ export function setRepeatQuotes(val, nosave) {
val = "off";
}
config.repeatQuotes = val;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//flip colors
@ -626,13 +626,13 @@ export function setFlipTestColors(flip, nosave) {
}
config.flipTestColors = flip;
TestUI.flipColors(flip);
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleFlipTestColors() {
config.flipTestColors = !config.flipTestColors;
TestUI.flipColors(config.flipTestColors);
saveToCookie();
saveToLocalStorage();
}
//extra color
@ -642,13 +642,13 @@ export function setColorfulMode(extra, nosave) {
}
config.colorfulMode = extra;
TestUI.colorful(extra);
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleColorfulMode() {
config.colorfulMode = !config.colorfulMode;
TestUI.colorful(config.colorfulMode);
saveToCookie();
saveToLocalStorage();
}
//strict space
@ -657,12 +657,12 @@ export function setStrictSpace(val, nosave) {
val = false;
}
config.strictSpace = val;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleStrictSpace() {
config.strictSpace = !config.strictSpace;
saveToCookie();
saveToLocalStorage();
}
//opposite shift space
@ -671,7 +671,7 @@ export function setOppositeShiftMode(val, nosave) {
val = "off";
}
config.oppositeShiftMode = val;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setPageWidth(val, nosave) {
@ -687,7 +687,7 @@ export function setPageWidth(val, nosave) {
if (val !== "100") {
$("#centerContent").addClass("wide" + val);
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setCaretStyle(caretStyle, nosave) {
@ -717,7 +717,7 @@ export function setCaretStyle(caretStyle, nosave) {
} else if (caretStyle == "banana") {
$("#caret").addClass("banana");
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setPaceCaretStyle(caretStyle, nosave) {
@ -742,7 +742,7 @@ export function setPaceCaretStyle(caretStyle, nosave) {
} else if (caretStyle == "underline") {
$("#paceCaret").addClass("underline");
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setShowTimerProgress(timer, nosave) {
@ -755,7 +755,7 @@ export function setShowTimerProgress(timer, nosave) {
} else {
TimerProgress.hide();
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleShowTimerProgress() {
@ -765,7 +765,7 @@ export function toggleShowTimerProgress() {
} else {
TimerProgress.hide();
}
saveToCookie();
saveToLocalStorage();
}
export function setShowLiveWpm(live, nosave) {
@ -778,7 +778,7 @@ export function setShowLiveWpm(live, nosave) {
} else {
LiveWpm.hide();
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleShowLiveWpm() {
@ -788,7 +788,7 @@ export function toggleShowLiveWpm() {
} else {
LiveWpm.hide();
}
saveToCookie();
saveToLocalStorage();
}
export function setShowLiveAcc(live, nosave) {
@ -801,7 +801,7 @@ export function setShowLiveAcc(live, nosave) {
} else {
LiveAcc.hide();
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleLiveAcc() {
@ -811,7 +811,7 @@ export function toggleLiveAcc() {
} else {
LiveAcc.hide();
}
saveToCookie();
saveToLocalStorage();
}
export function setHighlightMode(mode, nosave) {
@ -829,7 +829,7 @@ export function setHighlightMode(mode, nosave) {
mode = "letter";
}
config.highlightMode = mode;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setHideExtraLetters(val, nosave) {
@ -837,12 +837,12 @@ export function setHideExtraLetters(val, nosave) {
val = false;
}
config.hideExtraLetters = val;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleHideExtraLetters() {
config.hideExtraLetters = !config.hideExtraLetters;
saveToCookie();
saveToLocalStorage();
}
export function setTimerStyle(style, nosave) {
@ -850,7 +850,7 @@ export function setTimerStyle(style, nosave) {
style = "mini";
}
config.timerStyle = style;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setTimerColor(color, nosave) {
@ -892,14 +892,14 @@ export function setTimerColor(color, nosave) {
$("#miniTimerAndLiveWpm").addClass("timerText");
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setTimerOpacity(opacity, nosave) {
if (opacity == null || opacity == undefined) {
opacity = 0.25;
}
config.timerOpacity = opacity;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//key tips
@ -910,7 +910,7 @@ export function setKeyTips(keyTips, nosave) {
} else {
$("#bottom .keyTips").addClass("hidden");
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleKeyTips() {
@ -920,7 +920,7 @@ export function toggleKeyTips() {
} else {
$("#bottom .keyTips").addClass("hidden");
}
saveToCookie();
saveToLocalStorage();
}
//mode
@ -938,7 +938,7 @@ export function setTimeConfig(time, nosave) {
$("#top .config .time .text-button[timeConfig='" + time + "']").addClass(
"active"
);
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//quote length
@ -966,7 +966,7 @@ export function setQuoteLength(len, nosave, multipleMode) {
"#top .config .quoteLength .text-button[quoteLength='" + ql + "']"
).addClass("active");
});
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setWordCount(wordCount, nosave) {
@ -983,13 +983,13 @@ export function setWordCount(wordCount, nosave) {
$(
"#top .config .wordCount .text-button[wordCount='" + wordCount + "']"
).addClass("active");
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//caret
export function setSmoothCaret(mode, nosave) {
config.smoothCaret = mode;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
if (mode) {
$("#caret").css("animation-name", "caretFlashSmooth");
} else {
@ -999,7 +999,7 @@ export function setSmoothCaret(mode, nosave) {
export function toggleSmoothCaret() {
config.smoothCaret = !config.smoothCaret;
saveToCookie();
saveToLocalStorage();
if (config.smoothCaret) {
$("#caret").css("animation-name", "caretFlashSmooth");
} else {
@ -1010,23 +1010,23 @@ export function toggleSmoothCaret() {
//startgraphsatzero
export function toggleStartGraphsAtZero() {
config.startGraphsAtZero = !config.startGraphsAtZero;
saveToCookie();
saveToLocalStorage();
}
export function setStartGraphsAtZero(mode, nosave) {
config.startGraphsAtZero = mode;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//linescroll
export function setSmoothLineScroll(mode, nosave) {
config.smoothLineScroll = mode;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleSmoothLineScroll() {
config.smoothLineScroll = !config.smoothLineScroll;
saveToCookie();
saveToLocalStorage();
}
//quick tab
@ -1043,12 +1043,10 @@ export function setQuickTabMode(mode, nosave) {
$("#bottom .keyTips").html(`<key>tab</key> - restart test<br>
<key>esc</key> - command line`);
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleQuickTabMode() {
console.log("before change");
console.log(config.quickTab);
config.quickTab = !config.quickTab;
if (!config.quickTab) {
$("#restartTestButton").removeClass("hidden");
@ -1061,13 +1059,7 @@ export function toggleQuickTabMode() {
$("#bottom .keyTips").html(`<key>tab</key> - restart test<br>
<key>esc</key> - command line`);
}
console.log("after change");
console.log(config.quickTab);
console.log("before save");
console.log(config.quickTab);
saveToCookie();
console.log("after save");
console.log(config.quickTab);
saveToLocalStorage();
}
export function previewFontFamily(font) {
@ -1106,7 +1098,7 @@ export function setFontFamily(font, nosave) {
'"' + font.replace(/_/g, " ") + '"'
);
ChartController.setDefaultFontFamily(font);
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
//freedom
@ -1118,7 +1110,7 @@ export function setFreedomMode(freedom, nosave) {
if (config.freedomMode && config.confidenceMode !== "off") {
config.confidenceMode = "off";
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleFreedomMode() {
@ -1126,7 +1118,7 @@ export function toggleFreedomMode() {
if (config.freedomMode && config.confidenceMode !== "off") {
config.confidenceMode = false;
}
saveToCookie();
saveToLocalStorage();
}
export function setConfidenceMode(cm, nosave) {
@ -1140,7 +1132,7 @@ export function setConfidenceMode(cm, nosave) {
}
TestUI.updateModesNotice();
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleIndicateTypos() {
@ -1149,7 +1141,7 @@ export function toggleIndicateTypos() {
it = false;
}
config.indicateTypos = it;
saveToCookie();
saveToLocalStorage();
}
export function setIndicateTypos(it, nosave) {
@ -1157,7 +1149,7 @@ export function setIndicateTypos(it, nosave) {
it = false;
}
config.indicateTypos = it;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setCustomTheme(boolean, nosave) {
@ -1167,14 +1159,14 @@ export function setCustomTheme(boolean, nosave) {
} else if (!boolean && !nosave) {
ThemeController.set(config.theme);
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setTheme(name, nosave) {
config.theme = name;
setCustomTheme(false, true, true);
ThemeController.set(config.theme);
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setRandomTheme(val, nosave) {
@ -1185,7 +1177,7 @@ export function setRandomTheme(val, nosave) {
ThemeController.clearRandom();
}
config.randomTheme = val;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleCustomTheme(nosave) {
@ -1196,7 +1188,7 @@ export function toggleCustomTheme(nosave) {
setCustomTheme(true);
ThemeController.set("custom");
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setCustomThemeColors(colors, nosave) {
@ -1205,7 +1197,7 @@ export function setCustomThemeColors(colors, nosave) {
// ThemeController.set("custom");
// applyCustomThemeColors();
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setLanguage(language, nosave) {
@ -1220,7 +1212,7 @@ export function setLanguage(language, nosave) {
} catch (e) {
console.log("Analytics unavailable");
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleMonkey(nosave) {
@ -1230,7 +1222,7 @@ export function toggleMonkey(nosave) {
} else {
$("#monkey").addClass("hidden");
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setMonkey(monkey, nosave) {
@ -1243,7 +1235,7 @@ export function setMonkey(monkey, nosave) {
} else {
$("#monkey").addClass("hidden");
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setCapsLockBackspace(capsLockBackspace, nosave) {
@ -1251,7 +1243,7 @@ export function setCapsLockBackspace(capsLockBackspace, nosave) {
capsLockBackspace = false;
}
config.capsLockBackspace = capsLockBackspace;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function toggleCapsLockBackspace() {
@ -1266,7 +1258,7 @@ export function setKeymapMode(mode, nosave) {
$(".keymap-key").attr("style", "");
config.keymapMode = mode;
if (!nosave) TestLogic.restart(false, nosave);
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setKeymapLegendStyle(style, nosave) {
@ -1294,7 +1286,7 @@ export function setKeymapLegendStyle(style, nosave) {
// Update and save to cookie for persistence
$(".keymapLegendStyle").addClass(style);
config.keymapLegendStyle = style;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setKeymapStyle(style, nosave) {
@ -1305,7 +1297,7 @@ export function setKeymapStyle(style, nosave) {
$(".keymap").addClass(style);
config.keymapStyle = style;
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setKeymapLayout(layout, nosave) {
@ -1314,7 +1306,7 @@ export function setKeymapLayout(layout, nosave) {
}
config.keymapLayout = layout;
Keymap.refreshKeys(layout, setKeymapLayout);
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setLayout(layout, nosave) {
@ -1326,7 +1318,7 @@ export function setLayout(layout, nosave) {
if (config.keymapLayout === "overrideSync") {
Keymap.refreshKeys(config.keymapLayout, setKeymapLayout);
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
// export function setSavedLayout(layout, nosave) {
@ -1373,7 +1365,7 @@ export function setFontSize(fontSize, nosave) {
$("#caret, #paceCaret").addClass("size3");
$("#miniTimerAndLiveWpm").addClass("size3");
}
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setCustomBackground(value, nosave) {
@ -1392,7 +1384,7 @@ export function setCustomBackground(value, nosave) {
(command) => command.id == "changeCustomBackground"
)[0].defaultValue = value;
ThemeController.applyCustomBackground();
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
} else {
Notifications.add("Invalid custom background URL", 0);
}
@ -1404,14 +1396,14 @@ export function setCustomBackgroundSize(value, nosave) {
}
config.customBackgroundSize = value;
ThemeController.applyCustomBackgroundSize();
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function setCustomBackgroundFilter(array, nosave) {
config.customBackgroundFilter = array;
BackgroundFilter.loadConfig(config.customBackgroundFilter);
BackgroundFilter.apply();
if (!nosave) saveToCookie();
if (!nosave) saveToLocalStorage();
}
export function apply(configObj) {
@ -1684,24 +1676,24 @@ export function reset() {
...defaultConfig,
};
apply();
saveToCookie();
saveToLocalStorage();
}
export function loadFromCookie() {
console.log("loading cookie config");
export function loadFromLocalStorage() {
console.log("loading localStorage config");
// let newConfig = $.cookie("config");
let newConfig = Misc.getCookie("config");
if (newConfig !== undefined && newConfig !== "") {
let newConfig = window.localStorage.getItem("config");
if (newConfig !== undefined && newConfig !== null && newConfig !== "") {
try {
newConfig = JSON.parse(newConfig);
} catch (e) {
newConfig = {};
}
apply(newConfig);
console.log("applying cookie config");
cookieConfig = newConfig;
saveToCookie(true);
console.log("saving cookie config");
console.log("applying localStorage config");
localStorageConfig = newConfig;
saveToLocalStorage(true);
console.log("saving localStorage config");
}
TestLogic.restart(false, true);
loadDone();

View file

@ -212,23 +212,46 @@ export async function getUserAverageWpm10(
function cont() {
let wpmSum = 0;
let count = 0;
let last10Wpm = 0;
let last10Count = 0;
// You have to use every so you can break out of the loop
dbSnapshot.results.every((result) => {
if (
result.mode == mode &&
result.mode2 == mode2 &&
result.punctuation == punctuation &&
result.language == language &&
result.difficulty == difficulty
) {
wpmSum += result.wpm;
count++;
if (count >= 10) {
return false;
// Continue if the mode2 doesn't match unless it's a quote.
if (result.mode2 != mode2 && mode != "quote") {
return true;
}
// Grab the most recent 10 wpm's for the current mode.
if (last10Count < 10) {
last10Wpm += result.wpm;
last10Count++;
}
// Check mode2 matches and append, for quotes this is the quote id.
if (result.mode2 == mode2) {
wpmSum += result.wpm;
count++;
if (count >= 10) {
// Break out of every loop since we a maximum of the last 10 wpm results.
return false;
}
}
}
return true;
});
// Return the last 10 average wpm for quote if the current quote id has never been completed before by the user.
if (count == 0 && mode == "quote") {
return Math.round(last10Wpm / last10Count);
}
// Return the average wpm of the last 10 completions for the targeted test mode.
return Math.round(wpmSum / count);
}

View file

@ -287,27 +287,28 @@ export async function getLanguage(lang) {
}
}
export function setCookie(cname, cvalue, exdays) {
var d = new Date();
d.setTime(d.getTime() + exdays * 24 * 60 * 60 * 1000);
var expires = "expires=" + d.toUTCString();
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
}
export function migrateFromCookies() {
["resultFilters", "config", "merchbannerclosed", "activeTags"].forEach(
function (name) {
let decodedCookie = decodeURIComponent(document.cookie).split(";");
let value = null;
export function getCookie(cname) {
var name = cname + "=";
var decodedCookie = decodeURIComponent(document.cookie);
var ca = decodedCookie.split(";");
for (var i = 0; i < ca.length; i++) {
var c = ca[i];
while (c.charAt(0) == " ") {
c = c.substring(1);
for (var i = 0; i < decodedCookie.length; i++) {
var c = decodedCookie[i];
while (c.charAt(0) == " ") {
c = c.substring(1);
}
if (c.indexOf(name + "=") == 0) {
value = c.substring(name.length + 1, c.length);
}
}
if (value) {
window.localStorage.setItem(name, value);
$.removeCookie(name, { path: "/" });
}
}
if (c.indexOf(name) == 0) {
return c.substring(name.length, c.length);
}
}
return "";
);
}
export function sendVerificationEmail() {

View file

@ -27,7 +27,7 @@ function hide() {
-1
);
}
UpdateConfig.saveToCookie();
UpdateConfig.saveToLocalStorage();
Settings.update();
}
$("#settingsImportWrapper")

View file

@ -7,7 +7,8 @@ import * as RouteController from "./route-controller";
import * as UI from "./ui";
ManualRestart.set();
UpdateConfig.loadFromCookie();
Misc.migrateFromCookies();
UpdateConfig.loadFromLocalStorage();
Misc.getReleasesFromGitHub();
$(document).ready(() => {
@ -19,7 +20,7 @@ $(document).ready(() => {
if (Config.quickTab) {
$("#restartTestButton").addClass("hidden");
}
if (!Misc.getCookie("merchbannerclosed")) {
if (!window.localStorage.getItem("merchbannerclosed")) {
$(".merchBanner").removeClass("hidden");
} else {
$(".merchBanner").remove();

View file

@ -93,7 +93,7 @@ function toggleFavourite(themename) {
newlist.push(themename);
UpdateConfig.setFavThemes(newlist);
}
UpdateConfig.saveToCookie();
UpdateConfig.saveToLocalStorage();
refreshButtons();
// showFavouriteThemesAtTheTop();
CommandlineLists.updateThemeCommands();

View file

@ -2,7 +2,7 @@ import * as DB from "./db";
import * as TestUI from "./test-ui";
import * as Misc from "./misc";
export function saveActiveToCookie() {
export function saveActiveToLocalStorage() {
let tags = [];
try {
@ -18,7 +18,7 @@ export function saveActiveToCookie() {
// expires: d,
// path: "/",
// });
Misc.setCookie("activeTags", JSON.stringify(tags), 365);
window.localStorage.setItem("activeTags", JSON.stringify(tags));
} catch (e) {}
}
@ -33,12 +33,12 @@ export function toggle(tagid, nosave = false) {
}
});
TestUI.updateModesNotice();
if (!nosave) saveActiveToCookie();
if (!nosave) saveActiveToLocalStorage();
}
export function loadActiveFromCookie() {
export function loadActiveFromLocalStorage() {
// let newTags = $.cookie("activeTags");
let newTags = Misc.getCookie("activeTags");
let newTags = window.localStorage.getItem("activeTags");
if (newTags !== undefined && newTags !== "") {
try {
newTags = JSON.parse(newTags);
@ -48,6 +48,6 @@ export function loadActiveFromCookie() {
newTags.forEach((ntag) => {
toggle(ntag, true);
});
saveActiveToCookie();
saveActiveToLocalStorage();
}
}

View file

@ -231,12 +231,12 @@ window.addEventListener("keydown", function (e) {
$(".merchBanner a").click((event) => {
$(".merchBanner").remove();
Misc.setCookie("merchbannerclosed", true, 365);
window.localStorage.setItem("merchbannerclosed", true);
});
$(".merchBanner .fas").click((event) => {
$(".merchBanner").remove();
Misc.setCookie("merchbannerclosed", true, 365);
window.localStorage.setItem("merchbannerclosed", true);
Notifications.add(
"Won't remind you anymore. Thanks for continued support <3",
0,

View file

@ -22,7 +22,6 @@
"turėti",
"visas",
"žmogus",
"Lietuva",
"kad",
"vienas",
"tik",
@ -120,7 +119,6 @@
"įvairus",
"dirbti",
"gal",
"Vilnius",
"pagrindinis",
"pateikti",
"pavyzdys",
@ -152,7 +150,6 @@
"aukštas",
"visai",
"naudoti",
"Europa",
"gyventi",
"nors",
"mano",
@ -164,7 +161,6 @@
"gerbti",
"būdas",
"senas",
"Kaunas",
"manyti",
"valdymas",
"ten",

View file

@ -22,7 +22,6 @@
"turėti",
"visas",
"žmogus",
"Lietuva",
"kad",
"vienas",
"tik",
@ -120,7 +119,6 @@
"įvairus",
"dirbti",
"gal",
"Vilnius",
"pagrindinis",
"pateikti",
"pavyzdys",
@ -152,7 +150,6 @@
"aukštas",
"visai",
"naudoti",
"Europa",
"gyventi",
"nors",
"mano",
@ -164,7 +161,6 @@
"gerbti",
"būdas",
"senas",
"Kaunas",
"manyti",
"valdymas",
"ten",
@ -206,8 +202,6 @@
"liga",
"organizacija",
"trys",
"tam",
"tikras",
"dalykas",
"vėlai",
"pusė",
@ -492,6 +486,521 @@
"apskaičiuoti",
"vidus",
"mokslinis",
"statyba"
"statyba",
"sukelti",
"nuošliauža",
"paprastas",
"reikšmė",
"apsauga",
"automobilis",
"mirti",
"sūnus",
"aplinka",
"naktis",
"pastebėti",
"tirti",
"galbūt",
"lemti",
"vartoti",
"atstovas",
"daina",
"mašina",
"planavimas",
"matyt",
"tikėtis",
"žuvis",
"menas",
"padėtis",
"specialistas",
"pasirinkti",
"variantas",
"kuo",
"artimas",
"dvasia",
"literatūra",
"pagalba",
"remti",
"idėja",
"vien",
"etapas",
"keturi",
"reikalauti",
"biudžetas",
"kūrinys",
"plotas",
"saulė",
"laukas",
"skirtingas",
"komanda",
"įranga",
"noras",
"sąvoka",
"blogis",
"cechas",
"nedidelis",
"rūšis",
"schema",
"trukmė",
"vaistas",
"fizinis",
"personalas",
"ekonomika",
"elgesys",
"kompiuteris",
"spalva",
"vyresnis",
"vidinis",
"staiga",
"stovėti",
"teorija",
"atsižvelgti",
"kambarys",
"nenorėti",
"įvykis",
"apibūdinti",
"sirgti",
"tinklas",
"zona",
"įvykti",
"partija",
"srautas",
"brolis",
"jausti",
"paruošti",
"gražus",
"riba",
"juodas",
"padalinys",
"panaudoti",
"savybė",
"vienetas",
"ateitis",
"dauguma",
"irgi",
"prisiminti",
"technika",
"apskaita",
"transportas",
"valia",
"skaityti",
"suvokti",
"kitaip",
"gatvė",
"pripažinti",
"tūkstantis",
"žinios",
"kryptis",
"langas",
"nė",
"oda",
"protas",
"kalnas",
"paslauga",
"institutas",
"motina",
"sutartis",
"vadyba",
"vertė",
"bandyti",
"sunkiai",
"keisti",
"namas",
"rodiklis",
"valdyti",
"apimtis",
"pagaliau",
"salė",
"direktorius",
"kontroliuoti",
"tarti",
"turinys",
"esmė",
"laikotarpis",
"parašyti",
"pobūdis",
"organizacinis",
"tiesiog",
"rengti",
"tarptautinis",
"blogas",
"plačiai",
"stiprus",
"kiekis",
"kultas",
"energija",
"galvoti",
"gamybinis",
"maistas",
"minutė",
"nuolat",
"patirti",
"stebėti",
"sudėtingas",
"akmuo",
"laidas",
"įdomus",
"aktas",
"pagaminti",
"žmona",
"lengvai",
"išleisti",
"išorinis",
"produktas",
"verslas",
"gyvas",
"muzika",
"paukštis",
"paviršius",
"būklė",
"netgi",
"pamatyti",
"pateikti",
"priminti",
"taisyklė",
"ciklas",
"stalas",
"apskritai",
"atsakomybė",
"draugija",
"būtent",
"gerokai",
"konfliktas",
"kūryba",
"komisija",
"upė",
"parduoti",
"pastatas",
"svarstyti",
"paaiškinti",
"sujungti",
"žaisti",
"mokytojas",
"pažinti",
"apimti",
"aprašyti",
"deja",
"pienas",
"rungtynės",
"saugoti",
"nagrinėti",
"patalpa",
"rašytojas",
"tvirtinti",
"ekspertizė",
"vienintelis",
"beje",
"policija",
"aptarnavimas",
"atvykti",
"judesys",
"ženklas",
"byla",
"liepa",
"parama",
"užmokestis",
"vasara",
"aiškiai",
"priėmimas",
"sėdėti",
"bendravimas",
"girdėti",
"reiškinys",
"tuomet",
"lova",
"poetas",
"posėdis",
"sesuo",
"vertinimas",
"vertybė",
"pažymėti",
"procentas",
"bent",
"grandinė",
"pasak",
"perduoti",
"pirkti",
"pranešėjas",
"užimti",
"platus",
"seniai",
"atsisakyti",
"mokslininkas",
"motyvas",
"studentas",
"tirpalas",
"draudimas",
"filosofija",
"kūrimas",
"pietūs",
"tiksliai",
"įgyvendinti",
"asmeninis",
"baigtis",
"gimti",
"paskirti",
"politika",
"projektavimas",
"atsakymas",
"finansai",
"modelis",
"palyginti",
"patenkinti",
"skirtis",
"stambus",
"tam",
"tarpusavis",
"draugas",
"istorinis",
"iškilti",
"pakeitimas",
"procedūra",
"aptarti",
"ekspertas",
"naudojimas",
"lentelė",
"lizdas",
"nematyti",
"išduoti",
"pajamos",
"surinkti",
"kova",
"vaizdas",
"doleris",
"klasė",
"pagalbinis",
"pasiūlymas",
"požymis",
"prekyba",
"tamsus",
"augti",
"gi",
"nuostata",
"paskelbti",
"siela",
"skatinti",
"išvada",
"partneris",
"trumpas",
"bendrauti",
"lengvas",
"pirštas",
"tiktai",
"įrašyti",
"brangus",
"pasaulinis",
"pilis",
"spauda",
"susidaryti",
"tautinis",
"tikėti",
"kompleksas",
"skausmas",
"kapitalas",
"paimti",
"pavadinti",
"svetimas",
"gydymas",
"organas",
"raštas",
"tikėjimas",
"grafikas",
"lapas",
"pora",
"turbūt",
"anas",
"drabužis",
"gyvulys",
"išlikti",
"likytis",
"numeris",
"sandėlis",
"svečias",
"tekstas",
"šalia",
"aiškinti",
"dalyvis",
"kelionė",
"žingsnis",
"pasidaryti",
"poveikis",
"raudonas",
"šaka",
"šaltas",
"ūkininkas",
"individualus",
"lietuviškas",
"mama",
"pereiti",
"srovinis",
"tradicija",
"dirbinys",
"pareigūnas",
"susipažinti",
"vidutinis",
"žaidimas",
"egzistuoti",
"išmokti",
"klaida",
"paskola",
"penki",
"prarasti",
"priskirti",
"rimtas",
"temperatūra",
"terminas",
"vidurys",
"mėginti",
"nutarti",
"pagalvoti",
"pakankamai",
"praktika",
"suomis",
"užtikrinti",
"vienetinis",
"atviras",
"didžiulis",
"pasiūlyti",
"rūmai",
"žvilgsnis",
"laivas",
"palaikyti",
"pirminis",
"prietaisas",
"tamsa",
"dešimtmetis",
"patirtis",
"vakar",
"baimė",
"dvasinis",
"elektra",
"para",
"sudėtis",
"šitaip",
"kaltė",
"kampas",
"kreiptis",
"liaudis",
"mokytis",
"paskirtis",
"pastatyti",
"pelnas",
"remtis",
"staklės",
"sveikas",
"sąrašas",
"apskritis",
"pasikeisti",
"sandara",
"stadija",
"vasaris",
"eilėraštis",
"interesas",
"kažkoks",
"kunigaikštis",
"pasakoti",
"skaičiavimas",
"dabartinis",
"daugiausia",
"klubas",
"mokymas",
"pradas",
"sumažėti",
"taškas",
"švietimas",
"žiema",
"imtis",
"išreikšti",
"mėgti",
"padidėti",
"pamažu",
"smulkus",
"šlapimas",
"akcinis",
"praeitis",
"įsivaizduoti",
"dangus",
"elgtis",
"indas",
"kilmė",
"koeficientas",
"raida",
"spoetas",
"vilkas",
"kodas",
"koncepcija",
"pabrėžti",
"realus",
"statyti",
"subjektas",
"taurė",
"tema",
"atsarga",
"kūdikis",
"nemažai",
"normatyvas",
"milijonas",
"sniegas",
"suma",
"susitikimas",
"vėjas",
"būtis",
"erdvė",
"esybė",
"jaunimas",
"kaimynas",
"komisaras",
"laikraštis",
"šimtas",
"tik",
"finansinis",
"iškelti",
"laipsnis",
"pokalbis",
"romanas",
"surasti",
"dingti",
"keistis",
"nepriklausyti",
"retai",
"trumpai",
"baras",
"bendradarbis",
"burna",
"garsus",
"įeiti",
"jaustis",
"jūra",
"natūralus",
"naudotis",
"nuspręsti",
"pajusti",
"pakelti",
"skirtumas",
"trūkumas",
"visuotinis",
"gulėti",
"itin",
"įgyti",
"likimas",
"planuoti",
"sužinoti",
"važiuoti",
"gydyti",
"įsitikinti",
"įtraukti",
"kaštas",
"kristi",
"pavykti",
"plaukas",
"skrandis",
"srovė",
"atgal",
"atsitikti",
"būsena",
"efektyvumas",
"kultūrinis",
"neaiškus",
"pateikimas",
"pozicija"
]
}

View file

@ -66,7 +66,7 @@
"tom",
"po",
"máš",
"k",
"robíme",
"môj",
"toho",
"bolo",
@ -97,7 +97,7 @@
"mu",
"neviem",
"povedal",
"oh",
"nedá",
"vy",
"teba",
"chceš",
@ -163,7 +163,7 @@
"jasné",
"otec",
"chcel",
"kurva",
"mame",
"tento",
"zo",
"musíme",
@ -311,20 +311,20 @@
"nejaký",
"muž",
"nebude",
"riti",
"profesor",
"super",
"dole",
"tejto",
"niekoho",
"neho",
"žena",
"ano",
"brata",
"svoj",
"dieťa",
"hore",
"môžete",
"správne",
"co",
"zvláštne",
"fakt",
"vaše",
"vidím",
@ -426,7 +426,7 @@
"malý",
"doktor",
"slečna",
"kámo",
"systém",
"taká",
"buď",
"chlapci",
@ -435,9 +435,9 @@
"dom",
"znova",
"mŕtvy",
"ze",
"priateľa",
"koniec",
"sakra",
"mojím",
"dám",
"zabiť",
"pokiaľ",
@ -455,7 +455,7 @@
"tvoju",
"volá",
"tí",
"the",
"jednoduché",
"dajte",
"myslela",
"života",
@ -511,12 +511,12 @@
"žiť",
"tohto",
"kúpiť",
"ňu",
"vody",
"dokonca",
"inak",
"práce",
"poznám",
"ó",
"chápeš",
"pozrieť",
"čím",
"zlato",
@ -530,7 +530,7 @@
"nemáme",
"robíte",
"počkajte",
"uh",
"nemajú",
"nový",
"eur",
"celú",
@ -541,7 +541,7 @@
"veľké",
"zatiaľ",
"ňom",
"chlape",
"chlapa",
"znovu",
"ženy",
"cestu",
@ -594,7 +594,7 @@
"odkiaľ",
"nevieš",
"neskoro",
"ta",
"lepší",
"výborne",
"prípade",
"nechajte",
@ -617,7 +617,7 @@
"potrebuje",
"vyzeráš",
"domu",
"dr",
"smiešne",
"povedzte",
"isté",
"dni",
@ -745,25 +745,25 @@
"potrebovať",
"zavolám",
"urob",
"ha",
"t",
"držať",
"bolí",
"urobili",
"ktorých",
"prachy",
"horšie",
"malá",
"pána",
"vašej",
"vidíte",
"povieš",
"priateľov",
"you",
"tím",
"robia",
"akú",
"šťastný",
"chápem",
"poriadne",
"rokmi",
"ne",
"ľúbim",
"veľká",
"nechce",
"zomrel",
@ -780,7 +780,7 @@
"začať",
"nemala",
"nemusíš",
"ked",
"ostatní",
"obaja",
"dala",
"oveľa",
@ -788,7 +788,7 @@
"nakoniec",
"radi",
"mysli",
"kamoš",
"svojim",
"chceme",
"rodinu",
"škole",
@ -798,20 +798,20 @@
"počúvajte",
"nehovor",
"zastaviť",
"pol",
"cítiť",
"vrátim",
"párty",
"rovnako",
"snažím",
"práci",
"zmysel",
"baby",
"prestať",
"otvor",
"odtiaľ",
"tými",
"dali",
"cesta",
"boha",
"vydrž",
"pohyb",
"zavolaj",
"myslieť",
@ -832,7 +832,7 @@
"počula",
"zobrať",
"hlavy",
"ah",
"dostaneme",
"nášho",
"žije",
"vezmem",
@ -866,7 +866,7 @@
"čaká",
"musia",
"mesiac",
"okay",
"vedia",
"trošku",
"prvé",
"dostanem",
@ -884,7 +884,7 @@
"chvíľku",
"zabudol",
"neboli",
"hovno",
"knihu",
"čase",
"hovorila",
"dávno",
@ -917,7 +917,7 @@
"naposledy",
"mnoho",
"drahá",
"hm",
"rande",
"nevadí",
"urobíme",
"spoločnosť",
@ -932,7 +932,7 @@
"stáť",
"hra",
"rozumieš",
"com",
"zabili",
"pomaly",
"dostane",
"cítiš",
@ -967,7 +967,7 @@
"pozrime",
"milé",
"kľud",
"idiot",
"pôjde",
"skús",
"moment",
"odkedy",
@ -997,11 +997,11 @@
"zmeniť",
"mesiacov",
"zabudni",
"wow",
"sami",
"ťažko",
"šiel",
"týždne",
"mimochodom",
"sadni"
]
}
}