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

Added new modifiers

This commit is contained in:
Jiiks 2016-04-02 08:53:39 +03:00
parent f5953cf72e
commit 78c7860c6c
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/main.css
View File

@ -148,12 +148,18 @@
background: rgba(123, 123, 123, 0.37);
}
.emoteflip {
.emoteflip, .emotespinflip {
transform:scaleX(-1);
}
.emotespin {
.emotespin, .emotespinflip {
animation: 1s emote-spin infinite linear;
}
.emotespin2 {
animation: 0.5s emote-spin infinite linear;
}
.emotespin3 {
animation: 0.2s emote-spin infinite linear;
}
.emotepulse {
animation: 1s emote-pulse infinite linear;
}

2
css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
js/main.js
View File

@ -525,7 +525,7 @@ EmoteModule.prototype.injectEmote = function (node) {
var useEmoteCss = false;
var sWord = word;
var emoteClass = "";
var allowedClasses = ["flip", "spin", "pulse"];
var allowedClasses = ["flip", "spin", "pulse", "spinflip", "spin2", "spin3"];
if(word.indexOf(":") > -1) {
userEmoteCss = true;
sWord = word.split(":")[0];

2
js/main.min.js vendored
View File

@ -19,7 +19,7 @@ function inject(){var parentInnerHTML=parent.innerHTML;var words=parentInnerHTML
markup.addClass("spoiler");markup.on("click",function(){$(this).removeClass("spoiler");spoilered.push($(this).attr("data-reactid"));});return;}
if(word.length<4){return;}
if(word=="ClauZ"){parentInnerHTML=parentInnerHTML.replace("ClauZ",'<img src="https://cdn.frankerfacez.com/emoticon/70852/1" style="width:25px; transform:translate(-29px, -14px);"></img>');return;}
if($.inArray(word,bemotes)!=-1)return;var useEmoteCss=false;var sWord=word;var emoteClass="";var allowedClasses=["flip","spin","pulse"];if(word.indexOf(":")>-1){userEmoteCss=true;sWord=word.split(":")[0];emoteClass=word.split(":")[1];if(allowedClasses.indexOf(emoteClass)<0){emoteClass="";}}
if($.inArray(word,bemotes)!=-1)return;var useEmoteCss=false;var sWord=word;var emoteClass="";var allowedClasses=["flip","spin","pulse","spinflip","spin2","spin3"];if(word.indexOf(":")>-1){userEmoteCss=true;sWord=word.split(":")[0];emoteClass=word.split(":")[1];if(allowedClasses.indexOf(emoteClass)<0){emoteClass="";}}
if(emotesTwitch.emotes.hasOwnProperty(sWord)){var len=Math.round(sWord.length / 4);var name=sWord.substr(0,len)+"\uFDD9"+sWord.substr(len,len)+"\uFDD9"+sWord.substr(len*2,len)+"\uFDD9"+sWord.substr(len*3);var url=twitchEmoteUrlStart+emotesTwitch.emotes[sWord].image_id+twitchEmoteUrlEnd;parentInnerHTML=parentInnerHTML.replace(word,'<div class="emotewrapper"><img class="emote emote'+emoteClass+'" alt="'+name+'" src="'+url+'"/><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');return;}
if(subEmotesTwitch.hasOwnProperty(sWord)){var len=Math.round(sWord.length / 4);var name=sWord.substr(0,len)+"\uFDD9"+sWord.substr(len,len)+"\uFDD9"+sWord.substr(len*2,len)+"\uFDD9"+sWord.substr(len*3);var url=twitchEmoteUrlStart+subEmotesTwitch[sWord]+twitchEmoteUrlEnd;parentInnerHTML=parentInnerHTML.replace(word,'<div class="emotewrapper"><img class="emote emote'+emoteClass+'" alt="'+name+'" src="'+url+'"/><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');return;}
if(typeof emotesFfz!=='undefined'&&settingsCookie["bda-es-1"]){if(emotesFfz.hasOwnProperty(sWord)){var len=Math.round(sWord.length / 4);var name=sWord.substr(0,len)+"\uFDD9"+sWord.substr(len,len)+"\uFDD9"+sWord.substr(len*2,len)+"\uFDD9"+sWord.substr(len*3);var url=ffzEmoteUrlStart+emotesFfz[sWord]+ffzEmoteUrlEnd;parentInnerHTML=parentInnerHTML.replace(word,'<div class="emotewrapper"><img class="emote emote'+emoteClass+'" alt="'+name+'" src="'+url+'"/><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');return;}}