monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2026-01-14 03:15:20 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixed chat scrolling

Browse source 
fixed tab inserting last emoji
This commit is contained in:
Miodec 2021-03-02 17:28:22 +00:00
parent 6bc09ff95e
commit 8f52cde98d
2 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/js/tribe.js
View file

@ -83,7 +83,11 @@ class EmojiSuggestions {
}
getActive() {
return this.suggestionList[this.currentSuggestion];
if (this.currentSuggestion === -1) {
return null;
} else {
return this.suggestionList[this.currentSuggestion];
}
}
moveActiveSuggestion(down) {
@ -97,10 +101,12 @@ class EmojiSuggestions {
}
show() {
this.currentSuggestion = 0;
this.element.removeClass("hidden");
}
hide() {
this.currentSuggestion = -1;
this.element.addClass("hidden");
}
}
@ -1293,14 +1299,16 @@ $(".pageTribe .lobby .chat .input input").keyup((e) => {
lobbySuggestions.moveActiveSuggestion(true);
} else if (e.key == "Tab") {
let emoji = lobbySuggestions.getActive();
let split = $(".pageTribe .lobby .chat .input input").val().split(" ");
if (emoji.type === "image") {
split[split.length - 1] = `:${emoji.from}:`;
} else if (emoji.type === "emoji") {
split[split.length - 1] = `${emoji.to}`;
if (emoji) {
let split = $(".pageTribe .lobby .chat .input input").val().split(" ");
if (emoji.type === "image") {
split[split.length - 1] = `:${emoji.from}:`;
} else if (emoji.type === "emoji") {
split[split.length - 1] = `${emoji.to}`;
}
$(".pageTribe .lobby .chat .input input").val(split.join(" ") + " ");
lobbySuggestions.hide();
}
$(".pageTribe .lobby .chat .input input").val(split.join(" ") + " ");
lobbySuggestions.hide();
} else {
let split = $(".pageTribe .lobby .chat .input input").val().split(" ");
split = split[split.length - 1];
@ -1335,18 +1343,20 @@ $(".pageTest #result .tribeResultChat .chat .input input").keyup((e) => {
resultSuggestions.moveActiveSuggestion(true);
} else if (e.key == "Tab") {
let emoji = resultSuggestions.getActive();
let split = $(".pageTest #result .tribeResultChat .chat .input input")
.val()
.split(" ");
if (emoji.type === "image") {
split[split.length - 1] = `:${emoji.from}:`;
} else if (emoji.type === "emoji") {
split[split.length - 1] = `${emoji.to}`;
if (emoji) {
let split = $(".pageTest #result .tribeResultChat .chat .input input")
.val()
.split(" ");
if (emoji.type === "image") {
split[split.length - 1] = `:${emoji.from}:`;
} else if (emoji.type === "emoji") {
split[split.length - 1] = `${emoji.to}`;
}
$(".pageTest #result .tribeResultChat .chat .input input").val(
split.join(" ") + " "
);
resultSuggestions.hide();
}
$(".pageTest #result .tribeResultChat .chat .input input").val(
split.join(" ") + " "
);
resultSuggestions.hide();
} else {
let split = $(".pageTest #result .tribeResultChat .chat .input input")
.val()
@ -1829,12 +1839,16 @@ $(
}
});
$(
".pageTribe .lobby .chat .messages, .pageTest #result .tribeResultChat .chat .messages"
).on("scroll", (e) => {
$(".pageTest #result .tribeResultChat .chat .messages").on("scroll", (e) => {
let chatEl = $(".pageTest #result .tribeResultChat .chat .messages")[0];
scrollChat =
chatEl.scrollHeight - chatEl.scrollTop <= chatEl.clientHeight + 10;
});
$(".pageTribe .lobby .chat .messages").on("scroll", (e) => {
let chatEl = $(".pageTribe .lobby .chat .messages")[0];
scrollChat = chatEl.scrollHeight - chatEl.scrollTop === chatEl.clientHeight;
console.log(scrollChat);
scrollChat =
chatEl.scrollHeight - chatEl.scrollTop <= chatEl.clientHeight + 10;
});
$(

3
src/sass/style.scss
View file

@ -3087,11 +3087,14 @@ key {
display: flex;
gap: 0.5rem;
align-items: center;
flex-wrap: wrap;
.emoji {
width: 1.25rem;
height: 1.25rem;
background-size: contain;
display: inline-block;
background-repeat: no-repeat;
background-position: center;
&.big {
width: 2.25rem;
height: 2.25rem;