From 00dfd4ff2a44ea7dfc7c7bda0e5aa8e6769c0802 Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 19:51:17 +0100 Subject: ebidense --- webAO/client.js | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'webAO/client.js') diff --git a/webAO/client.js b/webAO/client.js index 5b58d10..4e04ba5 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -341,6 +341,7 @@ class Client extends EventEmitter { // Load evidence array to select const evidence_select = document.getElementById("evi_select"); evidence_select.add(new Option("Custom", 0)); + console.log(evidence_arr); evidence_arr.forEach(evidence => { evidence_select.add(new Option(evidence)); }); @@ -681,7 +682,7 @@ class Client extends EventEmitter { evidence_box.innerHTML += `${this.evidences[i - 1].name}`; } } @@ -1381,7 +1382,7 @@ class Viewport { chatBox.style.display = "none"; chatBoxInner.className = ""; eviBox.style.opacity = "0"; - eviBox.style.height = "0%"; + eviBox.style.height = "0"; const shouts = [ undefined, "holdit", @@ -1453,19 +1454,20 @@ class Viewport { if (this.chatmsg.startspeaking) { if (this.chatmsg.evidence > 0) { // Prepare evidence - eviBox.style.backgroundImage = "url('" + client.evidences[this.chatmsg.evidence - 1].icon + "')"; + eviBox.src = safe_tags(client.evidences[this.chatmsg.evidence - 1].icon); + + eviBox.style.width = "auto"; + eviBox.style.height = "30%"; + eviBox.style.opacity = 1; if (this.chatmsg.side === "def") { // Only def show evidence on right eviBox.style.right = "1.5em"; eviBox.style.left = "initial"; - eviBox.style.height = "30%"; - eviBox.style.opacity = 1; - } else { + } else { eviBox.style.right = "initial"; eviBox.style.left = "1.5em"; - eviBox.style.height = "30%"; - eviBox.style.opacity = 1; + } } @@ -2047,13 +2049,14 @@ window.pickEmotion = pickEmotion; * Highlights and selects an evidence for in-character chat. * @param {string} evidence the evidence to be presented */ -export function pickEvidence(evidence) { +export function pickEvidence(evidenceID) { + const evidence = Number(evidenceID); if (client.selectedEvidence !== evidence) { //Update selected evidence if (client.selectedEvidence > 0) { - document.getElementById("evi_" + client.selectedEvidence).className = "client_button"; + document.getElementById("evi_" + client.selectedEvidence).className = "evi_icon"; } - document.getElementById("evi_" + evidence).className = "client_button dark"; + document.getElementById("evi_" + evidence).className = "evi_icon dark"; client.selectedEvidence = evidence; // Show evidence on information window @@ -2127,7 +2130,7 @@ window.deleteEvidence = deleteEvidence; export function cancelEvidence() { //Clear evidence data if (client.selectedEvidence > 0) { - document.getElementById("evi_" + client.selectedEvidence).className = "client_button"; + document.getElementById("evi_" + client.selectedEvidence).className = "evi_icon"; } client.selectedEvidence = 0; @@ -2137,7 +2140,7 @@ export function cancelEvidence() { document.getElementById("evi_filename").value = ""; document.getElementById("evi_name").value = ""; document.getElementById("evi_desc").value = ""; - document.getElementById("evi_icon").style.backgroundImage = "url('misc/empty.png')"; //Clear icon + document.getElementById("evi_preview").src = "misc/empty.png"; //Clear icon // Update button document.getElementById("evi_add").className = "client_button hover_button"; @@ -2170,14 +2173,14 @@ window.getIndexFromSelect = getIndexFromSelect; export function updateEvidenceIcon() { const evidence_select = document.getElementById("evi_select"); const evidence_filename = document.getElementById("evi_filename"); - const evidence_iconbox = document.getElementById("evi_icon"); + const evidence_iconbox = document.getElementById("evi_preview"); if (evidence_select.selectedIndex === 0) { evidence_filename.style.display = "initial"; - evidence_iconbox.style.backgroundImage = `url(${AO_HOST}evidence/${encodeURI(evidence_filename.value.toLowerCase())})`; + evidence_iconbox.src = AO_HOST + "evidence/" + encodeURI(evidence_filename.value.toLowerCase()); } else { evidence_filename.style.display = "none"; - evidence_iconbox.style.backgroundImage = `url(${AO_HOST}evidence/${encodeURI(evidence_select.value.toLowerCase())})`; + evidence_iconbox.src = AO_HOST + "evidence/" + encodeURI(evidence_select.value.toLowerCase()); } } window.updateEvidenceIcon = updateEvidenceIcon; -- cgit From c65fc73f7c12586bb52371ac24ebbec6e68d1bb9 Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 19:55:42 +0100 Subject: no more on/off emotes --- webAO/client.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'webAO/client.js') diff --git a/webAO/client.js b/webAO/client.js index 4e04ba5..f1ac510 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1063,14 +1063,13 @@ class Client extends EventEmitter { zoom: emoteinfo[3], sfx: esfx.toLowerCase(), sfxdelay: esfxd, - button_off: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_off.png`, - button_on: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` + emote_icon: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` }; emotesList.innerHTML += - `${emotes[i].desc}`; } pickEmotion(1); @@ -2035,13 +2034,13 @@ window.pickChar = pickChar; export function pickEmotion(emo) { try { if (client.selectedEmote !== -1) { - document.getElementById("emo_" + client.selectedEmote).src = client.emote.button_off; + document.getElementById("emo_" + client.selectedEmote).classList = "emote_button dark"; } } catch (err) { // do nothing } client.selectedEmote = emo; - document.getElementById("emo_" + emo).src = client.emote.button_on; + document.getElementById("emo_" + emo).classList = "emote_button"; } window.pickEmotion = pickEmotion; -- cgit From 7770106e86dd54472a1f89559eedd944e0ded755 Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 20:00:29 +0100 Subject: Revert "no more on/off emotes" This reverts commit c65fc73f7c12586bb52371ac24ebbec6e68d1bb9. --- webAO/client.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'webAO/client.js') diff --git a/webAO/client.js b/webAO/client.js index f1ac510..4e04ba5 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1063,13 +1063,14 @@ class Client extends EventEmitter { zoom: emoteinfo[3], sfx: esfx.toLowerCase(), sfxdelay: esfxd, - emote_icon: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` + button_off: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_off.png`, + button_on: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` }; emotesList.innerHTML += - `${emotes[i].desc}`; } pickEmotion(1); @@ -2034,13 +2035,13 @@ window.pickChar = pickChar; export function pickEmotion(emo) { try { if (client.selectedEmote !== -1) { - document.getElementById("emo_" + client.selectedEmote).classList = "emote_button dark"; + document.getElementById("emo_" + client.selectedEmote).src = client.emote.button_off; } } catch (err) { // do nothing } client.selectedEmote = emo; - document.getElementById("emo_" + emo).classList = "emote_button"; + document.getElementById("emo_" + emo).src = client.emote.button_on; } window.pickEmotion = pickEmotion; -- cgit From 8085841f6dd539759676566ae07125d422c86671 Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 20:01:39 +0100 Subject: Revert "Revert "no more on/off emotes"" This reverts commit 7770106e86dd54472a1f89559eedd944e0ded755. --- webAO/client.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'webAO/client.js') diff --git a/webAO/client.js b/webAO/client.js index 4e04ba5..f1ac510 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1063,14 +1063,13 @@ class Client extends EventEmitter { zoom: emoteinfo[3], sfx: esfx.toLowerCase(), sfxdelay: esfxd, - button_off: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_off.png`, - button_on: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` + emote_icon: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` }; emotesList.innerHTML += - `${emotes[i].desc}`; } pickEmotion(1); @@ -2035,13 +2034,13 @@ window.pickChar = pickChar; export function pickEmotion(emo) { try { if (client.selectedEmote !== -1) { - document.getElementById("emo_" + client.selectedEmote).src = client.emote.button_off; + document.getElementById("emo_" + client.selectedEmote).classList = "emote_button dark"; } } catch (err) { // do nothing } client.selectedEmote = emo; - document.getElementById("emo_" + emo).src = client.emote.button_on; + document.getElementById("emo_" + emo).classList = "emote_button"; } window.pickEmotion = pickEmotion; -- cgit From bd507aba979f83d14947dc8d1ec6c8d09f9edcac Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 28 Dec 2019 17:31:22 +0100 Subject: Revert "Revert "Revert "no more on/off emotes""" This reverts commit 8085841f6dd539759676566ae07125d422c86671. --- webAO/client.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'webAO/client.js') diff --git a/webAO/client.js b/webAO/client.js index f1ac510..4e04ba5 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1063,13 +1063,14 @@ class Client extends EventEmitter { zoom: emoteinfo[3], sfx: esfx.toLowerCase(), sfxdelay: esfxd, - emote_icon: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` + button_off: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_off.png`, + button_on: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` }; emotesList.innerHTML += - `${emotes[i].desc}`; } pickEmotion(1); @@ -2034,13 +2035,13 @@ window.pickChar = pickChar; export function pickEmotion(emo) { try { if (client.selectedEmote !== -1) { - document.getElementById("emo_" + client.selectedEmote).classList = "emote_button dark"; + document.getElementById("emo_" + client.selectedEmote).src = client.emote.button_off; } } catch (err) { // do nothing } client.selectedEmote = emo; - document.getElementById("emo_" + emo).classList = "emote_button"; + document.getElementById("emo_" + emo).src = client.emote.button_on; } window.pickEmotion = pickEmotion; -- cgit