Skip to content
Snippets Groups Projects

Some changes

Merged Max Wehmeier requested to merge some-changes into custom-server
All threads resolved!
Viewing commit 55bc5f47
Show latest version
1 file
+ 14
13
Compare changes
  • Side-by-side
  • Inline
+ 14
13
import SkribblClient from "../logic/SkribblClient.js";
import {CustomElement} from "../util/Util.js";
//TODO do cosmetics in the chat
//TODO FCKING FIX THE SHITTY SCROLLING! THIS IS BULLSHIT; NOTHING WORKS??
//TODO clen up code
//TODO fix scrolling??
//TODO clean up code
//TODO write comments
/**
@@ -139,8 +138,9 @@ class _SkribblMessage extends HTMLElement {
/**
* @param {string} innerHTML
* @param {string} color
* @param {string} backgroundColor
*/
constructor(innerHTML,color) {
constructor(innerHTML,color="#000000",backgroundColor="#ffffff") {
super();
this.attachShadow({mode:"open"});
this.shadowRoot.innerHTML = `
@@ -153,6 +153,7 @@ class _SkribblMessage extends HTMLElement {
`;
this.shadowRoot.querySelector("span").innerHTML = innerHTML;
this.style.color = color;
this.style.backgroundColor = backgroundColor;
}
/**
@@ -161,8 +162,7 @@ class _SkribblMessage extends HTMLElement {
*/
static createSkribblTextMessage(playerName,message) {
let innerHTML = "<b>" + playerName + ":</b> " + message;
let color = "#000000";
let element = new _SkribblMessage(innerHTML,color);
let element = new _SkribblMessage(innerHTML);
return element;
}
@@ -172,7 +172,7 @@ class _SkribblMessage extends HTMLElement {
*/
static createSkribblGhostMessage(playerName,message) {
let innerHTML = "<b>" + playerName + ":</b> " + message;
let color = "#ababab";
let color = "#908070";
let element = new _SkribblMessage(innerHTML,color);
return element;
}
@@ -181,7 +181,7 @@ class _SkribblMessage extends HTMLElement {
* @param {string} word
*/
static createSkribblReveal(word) {
let innerHTML = "The word was <b>'" + word + "'</b>";
let innerHTML = "The word was: <b>" + word + "</b>";
let color = "#00bf00";
let element = new _SkribblMessage(innerHTML,color);
return element;
@@ -192,8 +192,9 @@ class _SkribblMessage extends HTMLElement {
*/
static createSkribblClose(guess) {
let innerHTML = "<b>'" + guess + "'</b> is close!";
let color = "#649E64";
let element = new _SkribblMessage(innerHTML,color);
let color = "#7f7f21";
let backgroundColor = "#e8e890";
let element = new _SkribblMessage(innerHTML,color,backgroundColor);
return element;
}
@@ -214,7 +215,7 @@ class _SkribblMessage extends HTMLElement {
*/
static createSkribblNewDrawer(playerName) {
let innerHTML = "<b>'" + playerName + "'</b> is drawing now!";
let color = "#649E64";
let color = "#00bf00";
let element = new _SkribblMessage(innerHTML,color);
return element;
}
@@ -224,7 +225,7 @@ class _SkribblMessage extends HTMLElement {
*/
static createSkribblJoin(playerName) {
let innerHTML = "<b>'" + playerName + "'</b> joined!";
let color = "#649E64";
let color = "#008000";
let element = new _SkribblMessage(innerHTML,color);
return element;
}
@@ -234,7 +235,7 @@ class _SkribblMessage extends HTMLElement {
*/
static createSkribblLeave(playerName) {
let innerHTML = "<b>'" + playerName + "'</b> left!";
let color = "#649E64";
let color = "#800000";
let element = new _SkribblMessage(innerHTML,color);
return element;
}