moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix emote click-to-insert behavior

This commit is contained in:
calzoneman 2016-05-04 20:52:55 -07:00
parent 46eaa7e090
commit 59c7571ad5
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
www/js/util.js
View File

@ -2901,7 +2901,7 @@ function googlePlusSimulator2014(data) {
return data; return data;
} }
function EmoteList(selector) { function EmoteList(selector, emoteClickCallback) {
this.elem = $(selector); this.elem = $(selector);
this.initSearch(); this.initSearch();
this.initSortOption(); this.initSortOption();
@ -2911,6 +2911,7 @@ function EmoteList(selector) {
this.itemsPerPage = 25; this.itemsPerPage = 25;
this.emotes = []; this.emotes = [];
this.page = 0; this.page = 0;
this.emoteClickCallback = emoteClickCallback || function(){};
} }
EmoteList.prototype.initSearch = function () { EmoteList.prototype.initSearch = function () {
@ -3000,20 +3001,7 @@ EmoteList.prototype.loadPage = function (page) {
img.src = emote.image; img.src = emote.image;
img.className = "emote-preview"; img.className = "emote-preview";
img.title = emote.name; img.title = emote.name;
img.onclick = function () { img.onclick = _this.emoteClickCallback.bind(null, emote);
var val = chatline.value;
if (!val) {
chatline.value = emote.name;
} else {
if (!val.charAt(val.length - 1).match(/\s/)) {
chatline.value += " ";
}
chatline.value += emote.name;
}
_this.modal.modal("hide");
chatline.focus();
};
td.appendChild(img); td.appendChild(img);
row.appendChild(td); row.appendChild(td);
@ -3023,7 +3011,22 @@ EmoteList.prototype.loadPage = function (page) {
this.page = page; this.page = page;
}; };
window.EMOTELIST = new EmoteList("#emotelist"); function onEmoteClicked(emote) {
var val = chatline.value;
if (!val) {
chatline.value = emote.name;
} else {
if (!val.charAt(val.length - 1).match(/\s/)) {
chatline.value += " ";
}
chatline.value += emote.name;
}
window.EMOTELISTMODAL.modal("hide");
chatline.focus();
}
window.EMOTELIST = new EmoteList("#emotelist", onEmoteClicked);
window.EMOTELIST.sortAlphabetical = USEROPTS.emotelist_sort; window.EMOTELIST.sortAlphabetical = USEROPTS.emotelist_sort;
function showChannelSettings() { function showChannelSettings() {