lightcordwarez
/
BetterDiscordApp-v1
mirror of https://github.com/jiiks/betterdiscordapp.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into beta

This commit is contained in:
Jiiks 2015-10-31 23:15:12 +02:00
parent 5442b1d5a7 306a00152a
commit 9f7d0b6b2c
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/emotemodule.js
View File

@ -70,6 +70,10 @@ EmoteModule.prototype.injectEmote = function(node) {
words.some(function(word) { words.some(function(word) {
if(word.length < 4) {
return;
}
if(emotesTwitch.emotes.hasOwnProperty(word)) { if(emotesTwitch.emotes.hasOwnProperty(word)) {
parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + twitchEmoteUrlStart + emotesTwitch.emotes[word].image_id + twitchEmoteUrlEnd + " ><\/img>"); parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + twitchEmoteUrlStart + emotesTwitch.emotes[word].image_id + twitchEmoteUrlEnd + " ><\/img>");
return; return;

4
js/main.js
View File

@ -233,6 +233,10 @@ EmoteModule.prototype.injectEmote = function(node) {
words.some(function(word) { words.some(function(word) {
if($.inArray(word, bemotes) != -1) return; if($.inArray(word, bemotes) != -1) return;
if(word.length < 4) {
return;
}
if(emotesTwitch.emotes.hasOwnProperty(word)) { if(emotesTwitch.emotes.hasOwnProperty(word)) {
parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + twitchEmoteUrlStart + emotesTwitch.emotes[word].image_id + twitchEmoteUrlEnd + " ><\/img>"); parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + twitchEmoteUrlStart + emotesTwitch.emotes[word].image_id + twitchEmoteUrlEnd + " ><\/img>");

2
js/main.min.js vendored
View File

File diff suppressed because one or more lines are too long