Update seperated files
This commit is contained in:
Jiiks
parent
2efcdedf83
commit
9c20612ac9
51
js/bdapi.js
51
js/bdapi.js
|
|
@ -8,37 +8,76 @@
|
|||
* Plugin Template: https://gist.github.com/Jiiks/71edd5af0beafcd08956
|
||||
*/
|
||||
|
||||
function BdApi() {}
|
||||
|
||||
//Joins a server
|
||||
//code = server invite code
|
||||
BdApi.joinServer = function(code) {
|
||||
|
||||
opublicServers.joinServer(code);
|
||||
};
|
||||
|
||||
//Inject CSS to document head
|
||||
//id = id of element
|
||||
//css = custom css
|
||||
BdApi.injectCSS = function(id, css) {
|
||||
|
||||
$("head").append('<style id="'+id+'"></style>')
|
||||
$("#" + id).html(css);
|
||||
};
|
||||
|
||||
//Clear css/remove any element
|
||||
//id = id of element
|
||||
BdApi.clearCSS = function(id) {
|
||||
|
||||
$("#"+id).remove();
|
||||
};
|
||||
|
||||
//Get another plugin
|
||||
//name = name of plugin
|
||||
BdApi.getPlugin = function(name) {
|
||||
|
||||
if(bdplugins.hasOwnProperty(name)) {
|
||||
return bdplugins[name]["plugin"];
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
//Get ipc for reason
|
||||
BdApi.getIpc = function() {
|
||||
|
||||
return betterDiscordIPC;
|
||||
};
|
||||
|
||||
//Get BetterDiscord Core
|
||||
BdApi.getCore = function() {
|
||||
|
||||
return mainCore;
|
||||
};
|
||||
|
||||
//Attempts to get user id by username
|
||||
//Name = username
|
||||
//Since Discord hides users if there's too many, this will often fail
|
||||
BdApi.getUserIdByName = function(name) {
|
||||
var users = $(".member-username");
|
||||
|
||||
for(var i = 0 ; i < users.length ; i++) {
|
||||
var user = $(users[i]);
|
||||
if(user.text() == name) {
|
||||
var avatarUrl = user.closest(".member").find(".avatar-small").css("background-image");
|
||||
return avatarUrl.match(/\d+/);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
//Attempts to get username by id
|
||||
//ID = user id
|
||||
//Since Discord hides users if there's too many, this will often fail
|
||||
var gg;
|
||||
BdApi.getUserNameById = function(id) {
|
||||
var users = $(".avatar-small");
|
||||
|
||||
for(var i = 0 ; i < users.length ; i++) {
|
||||
var user = $(users[i]);
|
||||
var url = user.css("background-image");
|
||||
if(id == url.match(/\d+/)) {
|
||||
return user.parent().find(".member-username").text();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
299
js/core.js
299
js/core.js
|
|
@ -1,22 +1,15 @@
|
|||
/* BetterDiscordApp Core JavaScript
|
||||
* Version: 1.5
|
||||
* Version: 1.52
|
||||
* Author: Jiiks | http://jiiks.net
|
||||
* Date: 27/08/2015 - 16:36
|
||||
* Last Update: 24/010/2015 - 17:27
|
||||
* https://github.com/Jiiks/BetterDiscordApp
|
||||
*/
|
||||
|
||||
/*
|
||||
* =Changelog=
|
||||
* -v1.5
|
||||
* --Synchronized loading
|
||||
* --jsv 1.3
|
||||
* --Voice mode
|
||||
*/
|
||||
|
||||
var settingsPanel, emoteModule, utils, quickEmoteMenu, opublicServers, voiceMode;
|
||||
var jsVersion = 1.3;
|
||||
var supportedVersion = "0.1.5";
|
||||
var settingsPanel, emoteModule, utils, quickEmoteMenu, opublicServers, voiceMode, pluginModule, themeModule;
|
||||
var jsVersion = 1.54;
|
||||
var supportedVersion = "0.2.3";
|
||||
|
||||
var mainObserver;
|
||||
|
||||
|
|
@ -24,38 +17,123 @@ var twitchEmoteUrlStart = "https://static-cdn.jtvnw.net/emoticons/v1/";
|
|||
var twitchEmoteUrlEnd = "/1.0";
|
||||
var ffzEmoteUrlStart = "https://cdn.frankerfacez.com/emoticon/";
|
||||
var ffzEmoteUrlEnd = "/1";
|
||||
var bttvEmoteUrlStart = "";
|
||||
var bttvEmoteUrlEnd = "";
|
||||
var bttvEmoteUrlStart = "https://cdn.betterttv.net/emote/";
|
||||
var bttvEmoteUrlEnd = "/1x";
|
||||
|
||||
var mainCore;
|
||||
|
||||
var settings = {
|
||||
"Save logs locally": { "id": "bda-gs-0", "info": "Saves chat logs locally", "implemented":false },
|
||||
"Public Servers": { "id": "bda-gs-1", "info": "BETA : Display public servers button", "implemented":true},
|
||||
"Minimal Mode": { "id": "bda-gs-2", "info": "Hide elements and reduce the size of elements.", "implemented":true},
|
||||
"Voice Mode": { "id": "bda-gs-4", "info": "Only show voice chat", "implemented":true},
|
||||
"Hide Channels": { "id": "bda-gs-3", "info": "Hide channels in minimal mode", "implemented":true},
|
||||
"Quick Emote Menu": { "id": "bda-es-0", "info": "Show quick emote menu for adding emotes", "implemented":true },
|
||||
"FrankerFaceZ Emotes": { "id": "bda-es-1", "info": "Show FrankerFaceZ Emotes", "implemented":true },
|
||||
"BetterTTV Emotes": { "id": "bda-es-2", "info": "Show BetterTTV Emotes", "implemented":true },
|
||||
"Emote Autocomplete": { "id": "bda-es-3", "info": "Autocomplete emote commands", "implemented":false },
|
||||
"Emote Auto Capitalization": { "id": "bda-es-4", "info": "Autocapitalize emote commands", "implemented":true },
|
||||
"Override Default Emotes": { "id": "bda-es-5", "info": "Override default emotes", "implemented":false }
|
||||
"Save logs locally": { "id": "bda-gs-0", "info": "Saves chat logs locally", "implemented": false },
|
||||
"Public Servers": { "id": "bda-gs-1", "info": "Display public servers button", "implemented": true },
|
||||
"Minimal Mode": { "id": "bda-gs-2", "info": "Hide elements and reduce the size of elements.", "implemented": true },
|
||||
"Voice Mode": { "id": "bda-gs-4", "info": "Only show voice chat", "implemented": true },
|
||||
"Hide Channels": { "id": "bda-gs-3", "info": "Hide channels in minimal mode", "implemented": true },
|
||||
"Quick Emote Menu": { "id": "bda-es-0", "info": "Show quick emote menu for adding emotes", "implemented": true },
|
||||
"Show Emotes": { "id": "bda-es-7", "info": "Show any emotes", "implemented": true },
|
||||
"FrankerFaceZ Emotes": { "id": "bda-es-1", "info": "Show FrankerFaceZ Emotes", "implemented": true },
|
||||
"BetterTTV Emotes": { "id": "bda-es-2", "info": "Show BetterTTV Emotes", "implemented": true },
|
||||
"Emote Autocomplete": { "id": "bda-es-3", "info": "Autocomplete emote commands", "implemented": false },
|
||||
"Emote Auto Capitalization": { "id": "bda-es-4", "info": "Autocapitalize emote commands", "implemented": true },
|
||||
"Override Default Emotes": { "id": "bda-es-5", "info": "Override default emotes", "implemented": false },
|
||||
"Show Names": { "id": "bda-es-6", "info": "Show emote names on hover", "implemented": true }
|
||||
}
|
||||
|
||||
var links = {
|
||||
"Jiiks.net": { "text": "Jiiks.net", "href": "http://jiiks.net", "target": "_blank" },
|
||||
"twitter": { "text": "Twitter", "href": "http://twitter.com/jiiksi", "target": "_blank" },
|
||||
"github": { "text": "Github", "href": "http://github.com/jiiks", "target": "_blank" }
|
||||
};
|
||||
|
||||
var defaultCookie = {
|
||||
"version":jsVersion,
|
||||
"bda-gs-0":false,
|
||||
"bda-gs-1":true,
|
||||
"bda-gs-2":false,
|
||||
"bda-gs-3":false,
|
||||
"bda-gs-4":false,
|
||||
"bda-es-0":true,
|
||||
"bda-es-1":false,
|
||||
"bda-es-2":false,
|
||||
"bda-es-3":false,
|
||||
"bda-es-4":false,
|
||||
"bda-es-5":true
|
||||
"version": jsVersion,
|
||||
"bda-gs-0": false,
|
||||
"bda-gs-1": true,
|
||||
"bda-gs-2": false,
|
||||
"bda-gs-3": false,
|
||||
"bda-gs-4": false,
|
||||
"bda-es-0": true,
|
||||
"bda-es-1": false,
|
||||
"bda-es-2": false,
|
||||
"bda-es-3": false,
|
||||
"bda-es-4": false,
|
||||
"bda-es-5": true,
|
||||
"bda-es-6": true,
|
||||
"bda-es-7": true,
|
||||
"bda-jd": true
|
||||
};
|
||||
|
||||
var bdchangelog = {
|
||||
"changes": {
|
||||
"favemotes": {
|
||||
"title": "Favorite Emotes!",
|
||||
"text": "You can now favorite emotes and have them listed in the quick emote menu!",
|
||||
"img": ""
|
||||
},
|
||||
"plugins": {
|
||||
"title": "Plugins!",
|
||||
"text": "Combined with Core 0.2.3, you can now write JavaScript plugins for Discord!",
|
||||
"img": ""
|
||||
},
|
||||
"settingsmenu": {
|
||||
"title": "Settings Menu!",
|
||||
"text": "New and improved settings menu!",
|
||||
"img": ""
|
||||
},
|
||||
"csseditor": {
|
||||
"title": "New CSS Editor!",
|
||||
"text": "New CSS Editor powered by <a href='http://codemirror.net' target='_blank'>CodeMirror!</a>",
|
||||
"img": ""
|
||||
},
|
||||
"minimalmode": {
|
||||
"title": "Minimal mode makeover!",
|
||||
"text": "New and improved minimal mode!",
|
||||
"img": ""
|
||||
}
|
||||
},
|
||||
"fixes": {
|
||||
"reload": {
|
||||
"title": "Reload Fix!",
|
||||
"text": "Fixed an issue that caused Discord to crash on reload!",
|
||||
"img": ""
|
||||
},
|
||||
"eemotes": {
|
||||
"title": "Edit Emotes!",
|
||||
"text": "Edited messages now display emotes properly!",
|
||||
"img": ""
|
||||
},
|
||||
"pservers": {
|
||||
"title": "Public Servers",
|
||||
"text": "Public servers have been fixed!",
|
||||
"img": ""
|
||||
},
|
||||
"other": {
|
||||
"title": "Bugfixes!",
|
||||
"text": "Several smaller bugs fixed!",
|
||||
"img": ""
|
||||
}
|
||||
},
|
||||
"upcoming": {
|
||||
"ignore": {
|
||||
"title": "Ignore User!",
|
||||
"text": "Ignore users you don't like!",
|
||||
"img": ""
|
||||
},
|
||||
"themes": {
|
||||
"title": "Custom themes!",
|
||||
"text": "Write your own or download custom themes!",
|
||||
"img": ""
|
||||
},
|
||||
"favemotes": {
|
||||
"title": "Favorite emotes!",
|
||||
"text": "Add your favorite emote(s) to the quick emote menu!",
|
||||
"img": ""
|
||||
},
|
||||
"more": {
|
||||
"title": "More Things!",
|
||||
"text": "More things but probably not in the next version!",
|
||||
"img": ""
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var settingsCookie = {};
|
||||
|
|
@ -64,18 +142,20 @@ function Core() {}
|
|||
|
||||
Core.prototype.init = function() {
|
||||
|
||||
var self = this;
|
||||
|
||||
if(version < supportedVersion) {
|
||||
alert("BetterDiscord v" + version + "(your version)" + " is not supported by the latest js("+jsVersion+"). Please download the latest version from GitHub.");
|
||||
alert("BetterDiscord v" + version + "(your version)" + " is not supported by the latest js("+jsVersion+"). Please download the latest version from betterdiscord.net");
|
||||
return;
|
||||
}
|
||||
|
||||
utils = new Utils();
|
||||
utils.getHash();
|
||||
emoteModule = new EmoteModule();
|
||||
quickEmoteMenu = new QuickEmoteMenu();
|
||||
voiceMode = new VoiceMode();
|
||||
|
||||
emoteModule.init();
|
||||
emoteModule.autoCapitalize();
|
||||
|
||||
this.initSettings();
|
||||
this.initObserver();
|
||||
|
|
@ -83,32 +163,74 @@ Core.prototype.init = function() {
|
|||
//Incase were too fast
|
||||
function gwDefer() {
|
||||
console.log(new Date().getTime() + " Defer");
|
||||
if($(".guilds-wrapper").size() > 0) {
|
||||
if($(".guilds-wrapper .guilds").children().length > 0) {
|
||||
console.log(new Date().getTime() + " Defer Loaded");
|
||||
var guilds = $(".guilds li:first-child");
|
||||
|
||||
guilds.after($("<li></li>", { id: "bd-pub-li", css: { "height": "20px", "display": settingsCookie["bda-gs-1"] == true ? "" : "none" } }).append($("<div/>", { class: "guild-inner", css: { "height": "20px", "border-radius": "4px" } }).append($("<a/>").append($("<div/>", { css: { "line-height": "20px", "font-size": "12px" }, text: "public", id: "bd-pub-button" })))));
|
||||
guilds.after($("<li/>", {id:"tc-settings-li"}).append($("<div/>", { class: "guild-inner" }).append($("<a/>").append($("<div/>", { class: "avatar-small", id: "tc-settings-button" })))));
|
||||
|
||||
var showChannelsButton = $("<button/>", {
|
||||
class: "btn",
|
||||
id: "bd-show-channels",
|
||||
text: "R",
|
||||
css: {
|
||||
"cursor": "pointer"
|
||||
},
|
||||
click: function() {
|
||||
settingsCookie["bda-gs-3"] = false;
|
||||
$("body").removeClass("bd-minimal-chan");
|
||||
self.saveSettings();
|
||||
}
|
||||
});
|
||||
|
||||
$(".guilds-wrapper").prepend(showChannelsButton);
|
||||
|
||||
opublicServers = new PublicServers();
|
||||
|
||||
pluginModule = new PluginModule();
|
||||
pluginModule.loadPlugins();
|
||||
if(typeof(themesupport2) !== "undefined") {
|
||||
themeModule = new ThemeModule();
|
||||
themeModule.loadThemes();
|
||||
}
|
||||
|
||||
settingsPanel = new SettingsPanel();
|
||||
settingsPanel.init();
|
||||
|
||||
opublicServers = new PublicServers();
|
||||
opublicServers.init();
|
||||
|
||||
quickEmoteMenu.init(false);
|
||||
|
||||
$("#tc-settings-button").on("click", function() { settingsPanel.show(); });
|
||||
$("#bd-pub-button").on("click", function() { opublicServers.show(); });
|
||||
|
||||
opublicServers.init();
|
||||
|
||||
emoteModule.autoCapitalize();
|
||||
|
||||
|
||||
|
||||
|
||||
/*Display new features in BetterDiscord*/
|
||||
if(settingsCookie["version"] < jsVersion) {
|
||||
var cl = self.constructChangelog();
|
||||
$("body").append(cl);
|
||||
settingsCookie["version"] = jsVersion;
|
||||
self.saveSettings();
|
||||
}
|
||||
$("head").append('<script>Date.now||(Date.now=function(){return(new Date).getTime()}),function(){"use strict";for(var t=["webkit","moz"],e=0;e<t.length&&!window.requestAnimationFrame;++e){var i=t[e];window.requestAnimationFrame=window[i+"RequestAnimationFrame"],window.cancelAnimationFrame=window[i+"CancelAnimationFrame"]||window[i+"CancelRequestAnimationFrame"]}if(/iP(ad|hone|od).*OS 6/.test(window.navigator.userAgent)||!window.requestAnimationFrame||!window.cancelAnimationFrame){var s=0;window.requestAnimationFrame=function(t){var e=Date.now(),i=Math.max(s+16,e);return setTimeout(function(){t(s=i)},i-e)},window.cancelAnimationFrame=clearTimeout}}(),function(t){t.snowfall=function(e,i){function s(s,n,a,o){this.x=s,this.y=n,this.size=a,this.speed=o,this.step=0,this.stepSize=h(1,10)/100,i.collection&&(this.target=m[h(0,m.length-1)]);var r=null;i.image?(r=document.createElement("img"),r.src=i.image):(r=document.createElement("div"),t(r).css({background:i.flakeColor})),t(r).attr({"class":"snowfall-flakes"}).css({width:this.size,height:this.size,position:i.flakePosition,top:this.y,left:this.x,fontSize:0,zIndex:i.flakeIndex}),t(e).get(0).tagName===t(document).get(0).tagName?(t("body").append(t(r)),e=t("body")):t(e).append(t(r)),this.element=r,this.update=function(){if(this.y+=this.speed,this.y>l-(this.size+6)&&this.reset(),this.element.style.top=this.y+"px",this.element.style.left=this.x+"px",this.step+=this.stepSize,this.x+=y===!1?Math.cos(this.step):y+Math.cos(this.step),i.collection&&this.x>this.target.x&&this.x<this.target.width+this.target.x&&this.y>this.target.y&&this.y<this.target.height+this.target.y){var t=this.target.element.getContext("2d"),e=this.x-this.target.x,s=this.y-this.target.y,n=this.target.colData;if(void 0!==n[parseInt(e)][parseInt(s+this.speed+this.size)]||s+this.speed+this.size>this.target.height)if(s+this.speed+this.size>this.target.height){for(;s+this.speed+this.size>this.target.height&&this.speed>0;)this.speed*=.5;t.fillStyle="#fff",void 0==n[parseInt(e)][parseInt(s+this.speed+this.size)]?(n[parseInt(e)][parseInt(s+this.speed+this.size)]=1,t.fillRect(e,s+this.speed+this.size,this.size,this.size)):(n[parseInt(e)][parseInt(s+this.speed)]=1,t.fillRect(e,s+this.speed,this.size,this.size)),this.reset()}else this.speed=1,this.stepSize=0,parseInt(e)+1<this.target.width&&void 0==n[parseInt(e)+1][parseInt(s)+1]?this.x++:parseInt(e)-1>0&&void 0==n[parseInt(e)-1][parseInt(s)+1]?this.x--:(t.fillStyle="#fff",t.fillRect(e,s,this.size,this.size),n[parseInt(e)][parseInt(s)]=1,this.reset())}(this.x+this.size>d-c||this.x<c)&&this.reset()},this.reset=function(){this.y=0,this.x=h(c,d-c),this.stepSize=h(1,10)/100,this.size=h(100*i.minSize,100*i.maxSize)/100,this.element.style.width=this.size+"px",this.element.style.height=this.size+"px",this.speed=h(i.minSpeed,i.maxSpeed)}}function n(){for(r=0;r<a.length;r+=1)a[r].update();f=requestAnimationFrame(function(){n()})}var a=[],o={flakeCount:35,flakeColor:"#ffffff",flakePosition:"absolute",flakeIndex:999999,minSize:1,maxSize:2,minSpeed:1,maxSpeed:5,round:!1,shadow:!1,collection:!1,collectionHeight:40,deviceorientation:!1},i=t.extend(o,i),h=function(t,e){return Math.round(t+Math.random()*(e-t))};t(e).data("snowfall",this);var r=0,l=t(e).height(),d=t(e).width(),c=0,f=0;if(i.collection!==!1){var p=document.createElement("canvas");if(p.getContext&&p.getContext("2d"))for(var m=[],w=t(i.collection),g=i.collectionHeight,r=0;r<w.length;r++){var u=w[r].getBoundingClientRect(),x=t("<canvas/>",{"class":"snowfall-canvas"}),z=[];if(u.top-g>0){t("body").append(x),x.css({position:i.flakePosition,left:u.left+"px",top:u.top-g+"px"}).prop({width:u.width,height:g});for(var v=0;v<u.width;v++)z[v]=[];m.push({element:x.get(0),x:u.left,y:u.top-g,width:u.width,height:g,colData:z})}}else i.collection=!1}for(t(e).get(0).tagName===t(document).get(0).tagName&&(c=25),t(window).bind("resize",function(){l=t(e)[0].clientHeight,d=t(e)[0].offsetWidth}),r=0;r<i.flakeCount;r+=1)a.push(new s(h(c,d-c),h(0,l),h(100*i.minSize,100*i.maxSize)/100,h(i.minSpeed,i.maxSpeed)));i.round&&t(".snowfall-flakes").css({"-moz-border-radius":i.maxSize,"-webkit-border-radius":i.maxSize,"border-radius":i.maxSize}),i.shadow&&t(".snowfall-flakes").css({"-moz-box-shadow":"1px 1px 1px #555","-webkit-box-shadow":"1px 1px 1px #555","box-shadow":"1px 1px 1px #555"});var y=!1;i.deviceorientation&&t(window).bind("deviceorientation",function(t){y=.1*t.originalEvent.gamma}),n(),this.clear=function(){t(".snowfall-canvas").remove(),t(e).children(".snowfall-flakes").remove(),cancelAnimationFrame(f)}},t.fn.snowfall=function(e){return"object"==typeof e||void 0==e?this.each(function(){new t.snowfall(this,e)}):"string"==typeof e?this.each(function(){var e=t(this).data("snowfall");e&&e.clear()}):void 0}}(jQuery);</script>');
|
||||
//By http://www.somethinghitme.com
|
||||
|
||||
|
||||
$("head").append("<style>.CodeMirror{ min-width:100%; }</style>");
|
||||
|
||||
|
||||
} else {
|
||||
setTimeout(gwDefer(), 100);
|
||||
setTimeout(gwDefer, 100);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$(document).ready(function() {
|
||||
setTimeout(gwDefer, 500);
|
||||
setTimeout(gwDefer, 1000);
|
||||
});
|
||||
};
|
||||
|
||||
|
|
@ -143,6 +265,7 @@ Core.prototype.initObserver = function() {
|
|||
if(mutation.target.getAttribute('class') != null) {
|
||||
if(mutation.target.getAttribute('class').indexOf("titlebar") != -1) {
|
||||
quickEmoteMenu.obsCallback();
|
||||
voiceMode.obsCallback();
|
||||
}
|
||||
}
|
||||
emoteModule.obsCallback(mutation);
|
||||
|
|
@ -152,4 +275,88 @@ Core.prototype.initObserver = function() {
|
|||
|
||||
//noinspection JSCheckFunctionSignatures
|
||||
mainObserver.observe(document, { childList: true, subtree: true });
|
||||
};
|
||||
};
|
||||
|
||||
Core.prototype.constructChangelog = function() {
|
||||
var changeLog = '' +
|
||||
'<div id="bd-wn-modal" class="modal" style="opacity:1;">' +
|
||||
' <div class="modal-inner">' +
|
||||
' <div id="bdcl" class="change-log"> ' +
|
||||
' <div class="header">' +
|
||||
' <strong>What\'s new in BetterDiscord JS v1.53&' + jsVersion + '</strong>' +
|
||||
' <button class="close" onclick=\'$("#bd-wn-modal").remove();\'></button>' +
|
||||
' </div><!--header-->' +
|
||||
' <div class="scroller-wrap">' +
|
||||
' <div class="scroller">';
|
||||
|
||||
if(bdchangelog.changes != null) {
|
||||
changeLog += '' +
|
||||
'<h1 class="changelog-added">' +
|
||||
' <span>New Stuff</span>' +
|
||||
'</h1>' +
|
||||
'<ul>';
|
||||
|
||||
for(var change in bdchangelog.changes) {
|
||||
change = bdchangelog.changes[change];
|
||||
|
||||
changeLog += '' +
|
||||
'<li>' +
|
||||
' <strong>'+change.title+'</strong>' +
|
||||
' <div>'+change.text+'</div>' +
|
||||
'</li>';
|
||||
}
|
||||
|
||||
changeLog += '</ul>';
|
||||
}
|
||||
|
||||
if(bdchangelog.fixes != null) {
|
||||
changeLog += '' +
|
||||
'<h1 class="changelog-fixed">' +
|
||||
' <span>Fixed</span>' +
|
||||
'</h1>' +
|
||||
'<ul>';
|
||||
|
||||
for(var fix in bdchangelog.fixes) {
|
||||
fix = bdchangelog.fixes[fix];
|
||||
|
||||
changeLog += '' +
|
||||
'<li>' +
|
||||
' <strong>'+fix.title+'</strong>' +
|
||||
' <div>'+fix.text+'</div>' +
|
||||
'</li>';
|
||||
}
|
||||
|
||||
changeLog += '</ul>';
|
||||
}
|
||||
|
||||
if(bdchangelog.upcoming != null) {
|
||||
changeLog += '' +
|
||||
'<h1 class="changelog-in-progress">' +
|
||||
' <span>Coming Soon</span>' +
|
||||
'</h1>' +
|
||||
'<ul>';
|
||||
|
||||
for(var upc in bdchangelog.upcoming) {
|
||||
upc = bdchangelog.upcoming[upc];
|
||||
|
||||
changeLog += '' +
|
||||
'<li>' +
|
||||
' <strong>'+upc.title+'</strong>' +
|
||||
' <div>'+upc.text+'</div>' +
|
||||
'</li>';
|
||||
}
|
||||
|
||||
changeLog += '</ul>';
|
||||
}
|
||||
|
||||
changeLog += '' +
|
||||
' </div><!--scoller-->' +
|
||||
' </div><!--scroller-wrap-->' +
|
||||
' <div class="footer">' +
|
||||
' </div><!--footer-->' +
|
||||
' </div><!--change-log-->' +
|
||||
' </div><!--modal-inner-->' +
|
||||
'</div><!--modal-->';
|
||||
|
||||
return changeLog;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,15 +18,21 @@ var emotesBTTV = {};
|
|||
var emotesTwitch = { "emotes": { "emote": { "image_id": 0 } } }; //for ide
|
||||
var subEmotesTwitch = {};
|
||||
|
||||
//TODO Use emotesTwitch for autocap
|
||||
var twitchAc = {"4head":"4Head","anele":"ANELE","argieb8":"ArgieB8","arsonnosexy":"ArsonNoSexy","asianglow":"AsianGlow","atgl":"AtGL","athenapms":"AthenaPMS","ativy":"AtIvy","atww":"AtWW","babyrage":"BabyRage","batchest":"BatChest","bcwarrior":"BCWarrior","biblethump":"BibleThump","bigbrother":"BigBrother","bionicbunion":"BionicBunion","blargnaut":"BlargNaut","bloodtrail":"BloodTrail","bort":"BORT","brainslug":"BrainSlug","brokeback":"BrokeBack","buddhabar":"BuddhaBar","coolcat":"CoolCat","corgiderp":"CorgiDerp","cougarhunt":"CougarHunt","daesuppy":"DAESuppy","dansgame":"DansGame","dathass":"DatHass","datsheffy":"DatSheffy","dbstyle":"DBstyle","deexcite":"deExcite","deilluminati":"deIlluminati","dendiface":"DendiFace","dogface":"DogFace","doomguy":"DOOMGuy","eagleeye":"EagleEye","elegiggle":"EleGiggle","evilfetus":"EvilFetus","failfish":"FailFish","fpsmarksman":"FPSMarksman","frankerz":"FrankerZ","freakinstinkin":"FreakinStinkin","fungineer":"FUNgineer","funrun":"FunRun","fuzzyotteroo":"FuzzyOtterOO","gasjoker":"GasJoker","gingerpower":"GingerPower","grammarking":"GrammarKing","hassanchop":"HassanChop","heyguys":"HeyGuys","hotpokket":"HotPokket","humblelife":"HumbleLife","itsboshytime":"ItsBoshyTime","jebaited":"Jebaited","jkanstyle":"JKanStyle","joncarnage":"JonCarnage","kapow":"KAPOW","kappa":"Kappa","kappapride":"KappaPride","keepo":"Keepo","kevinturtle":"KevinTurtle","kippa":"Kippa","kreygasm":"Kreygasm","kzskull":"KZskull","mau5":"Mau5","mcat":"mcaT","mechasupes":"MechaSupes","mrdestructoid":"MrDestructoid","mvgame":"MVGame","nightbat":"NightBat","ninjatroll":"NinjaTroll","nonospot":"NoNoSpot","notatk":"NotATK","notlikethis":"NotLikeThis","omgscoots":"OMGScoots","onehand":"OneHand","opieop":"OpieOP","optimizeprime":"OptimizePrime","osbeaver":"OSbeaver","osbury":"OSbury","osdeo":"OSdeo","osfrog":"OSfrog","oskomodo":"OSkomodo","osrob":"OSrob","ossloth":"OSsloth","panicbasket":"panicBasket","panicvis":"PanicVis","pazpazowitz":"PazPazowitz","peopleschamp":"PeoplesChamp","permasmug":"PermaSmug","picomause":"PicoMause","pipehype":"PipeHype","pjharley":"PJHarley","pjsalt":"PJSalt","pmstwin":"PMSTwin","pogchamp":"PogChamp","poooound":"Poooound","praiseit":"PraiseIt","prchase":"PRChase","punchtrees":"PunchTrees","puppeyface":"PuppeyFace","raccattack":"RaccAttack","ralpherz":"RalpherZ","redcoat":"RedCoat","residentsleeper":"ResidentSleeper","ritzmitz":"RitzMitz","rulefive":"RuleFive","shadylulu":"ShadyLulu","shazam":"Shazam","shazamicon":"shazamicon","shazbotstix":"ShazBotstix","shibez":"ShibeZ","smorc":"SMOrc","smskull":"SMSkull","sobayed":"SoBayed","soonerlater":"SoonerLater","srihead":"SriHead","ssssss":"SSSsss","stonelightning":"StoneLightning","strawbeary":"StrawBeary","supervinlin":"SuperVinlin","swiftrage":"SwiftRage","tbbaconbiscuit":"tbBaconBiscuit","tbchickenbiscuit":"tbChickenBiscuit","tbquesarito":"tbQuesarito","tbsausagebiscuit":"tbSausageBiscuit","tbspicy":"tbSpicy","tbsriracha":"tbSriracha","tf2john":"TF2John","theking":"TheKing","theringer":"TheRinger","thetarfu":"TheTarFu","thething":"TheThing","thunbeast":"ThunBeast","tinyface":"TinyFace","toospicy":"TooSpicy","trihard":"TriHard","ttours":"TTours","uleetbackup":"UleetBackup","unclenox":"UncleNox","unsane":"UnSane","vaultboy":"VaultBoy","volcania":"Volcania","wholewheat":"WholeWheat","winwaker":"WinWaker","wtruck":"WTRuck","wutface":"WutFace","youwhy":"YouWHY"};
|
||||
function EmoteModule() {
|
||||
}
|
||||
|
||||
function EmoteModule() {}
|
||||
EmoteModule.prototype.init = function() {
|
||||
};
|
||||
|
||||
EmoteModule.prototype.init = function() {};
|
||||
EmoteModule.prototype.getBlacklist = function() {
|
||||
$.getJSON("https://cdn.rawgit.com/Jiiks/betterDiscordApp/"+_hash+"/emotefilter.json", function(data) { bemotes = data.blacklist; });
|
||||
};
|
||||
|
||||
EmoteModule.prototype.obsCallback = function(mutation) {
|
||||
var self = this;
|
||||
|
||||
if(!settingsCookie["bda-es-7"]) return;
|
||||
|
||||
for(var i = 0 ; i < mutation.addedNodes.length ; ++i) {
|
||||
var next = mutation.addedNodes.item(i);
|
||||
if(next) {
|
||||
|
|
@ -50,10 +56,13 @@ EmoteModule.prototype.getNodes = function(node) {
|
|||
nodes.push(next);
|
||||
}
|
||||
|
||||
|
||||
return nodes;
|
||||
};
|
||||
|
||||
//TODO Functional titles
|
||||
var bemotes = [];
|
||||
var spoilered = [];
|
||||
|
||||
EmoteModule.prototype.injectEmote = function(node) {
|
||||
|
||||
if(typeof emotesTwitch === 'undefined') return;
|
||||
|
|
@ -61,62 +70,126 @@ EmoteModule.prototype.injectEmote = function(node) {
|
|||
if(!node.parentElement) return;
|
||||
|
||||
var parent = node.parentElement;
|
||||
|
||||
if(parent.tagName != "SPAN") return;
|
||||
|
||||
var edited = false;
|
||||
|
||||
if($(parent.parentElement).hasClass("edited")) {
|
||||
parent = parent.parentElement.parentElement.firstChild; //:D
|
||||
edited = true;
|
||||
}
|
||||
|
||||
//if(!$(parent.parentElement).hasClass("markup") && !$(parent.parentElement).hasClass("message-content")) return;
|
||||
|
||||
var parentInnerHTML = parent.innerHTML;
|
||||
var words = parentInnerHTML.split(/\s+/g);
|
||||
function inject() {
|
||||
if(!$(parent.parentElement).hasClass("markup") && !$(parent.parentElement).hasClass("message-content")) { return; }
|
||||
|
||||
if(!words) return;
|
||||
var parentInnerHTML = parent.innerHTML;
|
||||
var words = parentInnerHTML.split(/\s+/g);
|
||||
|
||||
words.some(function(word) {
|
||||
if(!words) return;
|
||||
|
||||
if(word.length < 4) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(emotesTwitch.emotes.hasOwnProperty(word)) {
|
||||
parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + twitchEmoteUrlStart + emotesTwitch.emotes[word].image_id + twitchEmoteUrlEnd + " ><\/img>");
|
||||
return;
|
||||
}
|
||||
words.some(function(word) {
|
||||
|
||||
if(word.slice(0, 4) == "[!s]" ) {
|
||||
|
||||
parentInnerHTML = parentInnerHTML.replace("[!s]", "");
|
||||
var markup = $(parent).parent();
|
||||
var reactId = markup.attr("data-reactid");
|
||||
|
||||
if(spoilered.indexOf(reactId) > -1) {
|
||||
return;
|
||||
}
|
||||
|
||||
markup.addClass("spoiler");
|
||||
markup.on("click", function() {
|
||||
$(this).removeClass("spoiler");
|
||||
spoilered.push($(this).attr("data-reactid"));
|
||||
});
|
||||
|
||||
if(typeof emotesFfz !== 'undefined' && settingsCookie["bda-es-1"]) {
|
||||
if(emotesFfz.hasOwnProperty(word)) {
|
||||
parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + ffzEmoteUrlStart + emotesFfz[word] + ffzEmoteUrlEnd + " ><\/img>");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if(typeof emotesBTTV !== 'undefined' && settingsCookie["bda-es-2"]) {
|
||||
if(emotesBTTV.hasOwnProperty(word)) {
|
||||
parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + emotesBTTV[word] + " ><\/img>");
|
||||
|
||||
if(word.length < 4) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (subEmotesTwitch.hasOwnProperty(word)) {
|
||||
parentInnerHTML = parentInnerHTML.replace(word, "<img src=" + twitchEmoteUrlStart + subEmotesTwitch[word] + twitchEmoteUrlEnd + " ><\/img>");
|
||||
}
|
||||
});
|
||||
if($.inArray(word, bemotes) != -1) return;
|
||||
|
||||
if(parent.parentElement == null) return;
|
||||
if (emotesTwitch.emotes.hasOwnProperty(word)) {
|
||||
var len = Math.round(word.length / 4);
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<img class="emote" alt="' + word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3) + '" src="' + twitchEmoteUrlStart + emotesTwitch.emotes[word].image_id + twitchEmoteUrlEnd + '" />');
|
||||
return;
|
||||
}
|
||||
|
||||
var oldHeight = parent.parentElement.offsetHeight;
|
||||
parent.innerHTML = parentInnerHTML;
|
||||
var newHeight = parent.parentElement.offsetHeight;
|
||||
if (typeof emotesFfz !== 'undefined' && settingsCookie["bda-es-1"]) {
|
||||
if (emotesFfz.hasOwnProperty(word)) {
|
||||
var len = Math.round(word.length / 4);
|
||||
var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
|
||||
var url = ffzEmoteUrlStart + emotesFfz[word] + ffzEmoteUrlEnd;
|
||||
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
//Scrollfix
|
||||
var scrollPane = $(".scroller.messages").first();
|
||||
scrollPane.scrollTop(scrollPane.scrollTop() + (newHeight - oldHeight));
|
||||
if (typeof emotesBTTV !== 'undefined' && settingsCookie["bda-es-2"]) {
|
||||
if (emotesBTTV.hasOwnProperty(word)) {
|
||||
var len = Math.round(word.length / 4);
|
||||
var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
|
||||
var url = emotesBTTV[word];
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if(typeof emotesBTTV2 !== 'undefined' && settingsCookie["bda-es-2"]) {
|
||||
if(emotesBTTV2.hasOwnProperty(word)) {
|
||||
var len = Math.round(word.length / 4);
|
||||
var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
|
||||
var url = bttvEmoteUrlStart + emotesBTTV2[word] + bttvEmoteUrlEnd;
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (subEmotesTwitch.hasOwnProperty(word)) {
|
||||
var len = Math.round(word.length / 4);
|
||||
var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
|
||||
var url = twitchEmoteUrlStart + subEmotesTwitch[word] + twitchEmoteUrlEnd;
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
return;
|
||||
}
|
||||
});
|
||||
|
||||
if(parent.parentElement == null) return;
|
||||
|
||||
var oldHeight = parent.parentElement.offsetHeight;
|
||||
parent.innerHTML = parentInnerHTML.replace(new RegExp("\uFDD9", "g"), "");
|
||||
var newHeight = parent.parentElement.offsetHeight;
|
||||
|
||||
//Scrollfix
|
||||
var scrollPane = $(".scroller.messages").first();
|
||||
scrollPane.scrollTop(scrollPane.scrollTop() + (newHeight - oldHeight));
|
||||
}
|
||||
|
||||
if(edited) {
|
||||
setTimeout(inject, 250);
|
||||
} else {
|
||||
inject();
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
EmoteModule.prototype.autoCapitalize = function() {
|
||||
var self = this;
|
||||
var textArea = $(".channel-textarea-inner textarea");
|
||||
|
||||
$('body').delegate(textArea, 'keyup change paste', function() {
|
||||
var self = this;
|
||||
|
||||
$('body').delegate($(".channel-textarea-inner textarea"), 'keyup change paste', function() {
|
||||
if(!settingsCookie["bda-es-4"]) return;
|
||||
|
||||
var text = textArea.val();
|
||||
var text = $(".channel-textarea-inner textarea").val();
|
||||
|
||||
if(text == undefined) return;
|
||||
|
||||
|
|
@ -124,15 +197,17 @@ EmoteModule.prototype.autoCapitalize = function() {
|
|||
if(lastWord.length > 3) {
|
||||
var ret = self.capitalize(lastWord.toLowerCase());
|
||||
if(ret != null) {
|
||||
textArea.val(text.replace(lastWord, ret));
|
||||
$(".channel-textarea-inner textarea").val(text.replace(lastWord, ret));
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
EmoteModule.prototype.capitalize = function(value) {
|
||||
if(twitchAc.hasOwnProperty(value)) {
|
||||
return twitchAc[value];
|
||||
var res = emotesTwitch.emotes;
|
||||
for(var p in res){
|
||||
if(res.hasOwnProperty(p) && value == (p+ '').toLowerCase()){
|
||||
return p;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
14
js/main.js
14
js/main.js
|
|
@ -1350,6 +1350,13 @@ VoiceMode.prototype.disable = function() {
|
|||
$(".guild-header .btn.btn-hamburger").first().css("visibility", "");
|
||||
};
|
||||
|
||||
/* BetterDiscordApp PluginModule JavaScript
|
||||
* Version: 1.0
|
||||
* Author: Jiiks | http://jiiks.net
|
||||
* Date: 16/12/2015
|
||||
* https://github.com/Jiiks/BetterDiscordApp
|
||||
*/
|
||||
|
||||
var pluginCookie = {};
|
||||
|
||||
function PluginModule() {
|
||||
|
|
@ -1408,6 +1415,13 @@ PluginModule.prototype.savePluginData = function() {
|
|||
$.cookie("bd-plugins", JSON.stringify(pluginCookie), { expires: 365, path: '/' });
|
||||
};
|
||||
|
||||
/* BetterDiscordApp ThemeModule JavaScript
|
||||
* Version: 1.0
|
||||
* Author: Jiiks | http://jiiks.net
|
||||
* Date: 16/12/2015
|
||||
* https://github.com/Jiiks/BetterDiscordApp
|
||||
*/
|
||||
|
||||
var themeCookie = {};
|
||||
|
||||
function ThemeModule() {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,64 @@
|
|||
/* BetterDiscordApp PluginModule JavaScript
|
||||
* Version: 1.0
|
||||
* Author: Jiiks | http://jiiks.net
|
||||
* Date: 16/12/2015
|
||||
* https://github.com/Jiiks/BetterDiscordApp
|
||||
*/
|
||||
|
||||
var pluginCookie = {};
|
||||
|
||||
function PluginModule() {
|
||||
|
||||
}
|
||||
|
||||
PluginModule.prototype.loadPlugins = function() {
|
||||
|
||||
this.loadPluginData();
|
||||
|
||||
$.each(bdplugins, function() {
|
||||
var plugin = this["plugin"];
|
||||
plugin.load();
|
||||
|
||||
var name = plugin.getName();
|
||||
var enabled = false;
|
||||
|
||||
if(pluginCookie.hasOwnProperty(name)) {
|
||||
enabled = pluginCookie[name];
|
||||
} else {
|
||||
pluginCookie[name] = false;
|
||||
}
|
||||
|
||||
if(enabled) {
|
||||
plugin.start();
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
PluginModule.prototype.handlePlugin = function(checkbox) {
|
||||
|
||||
var cb = $(checkbox).children().find('input[type="checkbox"]');
|
||||
var enabled = !cb.is(":checked");
|
||||
var id = cb.attr("id");
|
||||
cb.prop("checked", enabled);
|
||||
|
||||
if(enabled) {
|
||||
bdplugins[id]["plugin"].start();
|
||||
pluginCookie[id] = true;
|
||||
} else {
|
||||
bdplugins[id]["plugin"].stop();
|
||||
pluginCookie[id] = false;
|
||||
}
|
||||
|
||||
this.savePluginData();
|
||||
};
|
||||
|
||||
PluginModule.prototype.loadPluginData = function() {
|
||||
var cookie = $.cookie("bd-plugins");
|
||||
if(cookie != undefined) {
|
||||
pluginCookie = JSON.parse($.cookie("bd-plugins"));
|
||||
}
|
||||
};
|
||||
|
||||
PluginModule.prototype.savePluginData = function() {
|
||||
$.cookie("bd-plugins", JSON.stringify(pluginCookie), { expires: 365, path: '/' });
|
||||
};
|
||||
|
|
@ -65,8 +65,8 @@ PublicServers.prototype.init = function() {
|
|||
})).append($("<th/>", {
|
||||
text: "Description"
|
||||
})).append($("<th/>", {
|
||||
text: "Join"
|
||||
}));
|
||||
text: "Join"
|
||||
}));
|
||||
|
||||
headers.appendTo(thead);
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ PublicServers.prototype.init = function() {
|
|||
};
|
||||
|
||||
PublicServers.prototype.addServer = function(name, code, title, language, description) {
|
||||
var self = this;
|
||||
var self = this;
|
||||
var tableBody = $("#bd-ps-tbody");
|
||||
|
||||
|
||||
|
|
@ -155,9 +155,8 @@ PublicServers.prototype.show = function() {
|
|||
|
||||
//Workaround for joining a server
|
||||
PublicServers.prototype.joinServer = function(code) {
|
||||
console.log("Code: " + code);
|
||||
$(".guilds-add").click();
|
||||
$(".action.join .btn").click();
|
||||
$(".create-guild-container input").val(code);
|
||||
$(".form.join-server .btn-primary").click();
|
||||
$(".guilds-add").click();
|
||||
$(".action.join .btn").click();
|
||||
$(".create-guild-container input").val(code);
|
||||
$(".form.join-server .btn-primary").click();
|
||||
};
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,58 +1,23 @@
|
|||
/* BetterDiscordApp Settings Panel JavaScript
|
||||
* Version: 1.3
|
||||
* Version: 2.0
|
||||
* Author: Jiiks | http://jiiks.net
|
||||
* Date: 26/08/2015 - 11:54
|
||||
* Last Update: 30/08/2015 - 12:16
|
||||
* Last Update: 27/11/2015 - 00:50
|
||||
* https://github.com/Jiiks/BetterDiscordApp
|
||||
*/
|
||||
|
||||
var links = { "Jiiks.net": "http://jiiks.net", "Twitter": "http://twitter.com/jiiksi", "Github": "https://github.com/jiiks" };
|
||||
var settingsButton = null;
|
||||
var panel = null;
|
||||
|
||||
function SettingsPanel() {
|
||||
|
||||
utils.injectJs("https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.9.0/codemirror.min.js");
|
||||
utils.injectJs("https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.9.0/mode/css/css.min.js");
|
||||
}
|
||||
|
||||
SettingsPanel.prototype.getPanel = function() {
|
||||
return this.tcSettingsPanel;
|
||||
};
|
||||
|
||||
SettingsPanel.prototype.init = function() {
|
||||
|
||||
var self = this;
|
||||
self.construct();
|
||||
var body = $("body");
|
||||
this.tcSettingsPanel = $("<div/>", { id: "tc-settings-panel", style: "display:none" });
|
||||
this.getPanel().append($("<div/>", { id: "tc-settings-panel-header" }).append($("<h2/>", { text: "BetterDiscord - Settings" })).append($("<span/>", { id: "tc-settings-close", text: "X", style:"cursor:pointer;" })));
|
||||
|
||||
var settingsList = $("<ul/>");
|
||||
this.getPanel().append($("<div/>", { id: "tc-settings-panel-body" }).append(settingsList));
|
||||
|
||||
$.each(settings, function(key, value) {
|
||||
var son = "tc-switch-on";
|
||||
var sof = "tc-switch-off";
|
||||
|
||||
if(settingsCookie[value.id]) {
|
||||
son = "tc-switch-on active";
|
||||
}else {
|
||||
sof = "tc-switch-off active";
|
||||
}
|
||||
|
||||
settingsList.append($("<li/>").append($("<h2/>", { text: key})).append($("<span/>", { html: " - <span>" + value.info + "</span>" + (value.implemented == false ? '<span style="color:red"> Coming Soon</span>' : "") })).append($("<div/>", { class: value.implemented ? "tc-switch" : "tc-switch disabled", id: value.id }).append($("<span/>", { class: sof, text: "OFF" })).append($("<span/>", { class: son, text: "ON" }))));
|
||||
});
|
||||
|
||||
var settingsFooter = $("<div/>", { id: "tc-settings-panel-footer" });
|
||||
settingsFooter.append($("<span/>", { id: "tc-about", text: "BDA v" + version + "(js "+jsVersion+") by Jiiks | Settings are automatically saved." } ));
|
||||
var tcLinks = $("<span/>", { id: "tc-links" });
|
||||
$.each(links, function(key, value) {
|
||||
tcLinks.append($("<a/>", { href: value, text: key, target: "_blank" }));
|
||||
tcLinks.append($("<span/>", { text: " | " }));
|
||||
});
|
||||
settingsFooter.append(tcLinks);
|
||||
this.getPanel().append(settingsFooter);
|
||||
|
||||
|
||||
body.append(this.getPanel());
|
||||
$("#tc-settings-close").on("click", function() { self.show(); });
|
||||
$(".tc-switch").on("click", function() { self.handler($(this)) });
|
||||
|
||||
if(settingsCookie["bda-es-0"]) {
|
||||
$("#twitchcord-button-container").show();
|
||||
|
|
@ -74,64 +39,293 @@ SettingsPanel.prototype.init = function() {
|
|||
if(settingsCookie["bda-gs-4"]) {
|
||||
voiceMode.enable();
|
||||
}
|
||||
|
||||
if(settingsCookie["bda-jd"]) {
|
||||
opublicServers.joinServer("0Tmfo5ZbORCRqbAd");
|
||||
settingsCookie["bda-jd"] = false;
|
||||
mainCore.saveSettings();
|
||||
}
|
||||
|
||||
if (settingsCookie["bda-es-6"]) {
|
||||
//Pretty emote titles
|
||||
emoteNamePopup = $("<div class='tipsy tipsy-se' style='display: block; top: 82px; left: 1630.5px; visibility: visible; opacity: 0.8;'><div class='tipsy-inner'></div></div>");
|
||||
$(document).on("mouseover", ".emote", function() { var x = $(this).offset(); var title = $(this).attr("alt"); $(emoteNamePopup).find(".tipsy-inner").text(title); $(emoteNamePopup).css('left', x.left - 25); $(emoteNamePopup).css('top', x.top - 32); $("div[data-reactid='.0.1.1']").append($(emoteNamePopup));});
|
||||
$(document).on("mouseleave", ".emote", function(){$(".tipsy").remove()});
|
||||
} else {
|
||||
$(document).off('mouseover', '.emote');
|
||||
}
|
||||
};
|
||||
|
||||
SettingsPanel.prototype.applyCustomCss = function(css) {
|
||||
if($("#customcss").length == 0) {
|
||||
$("head").append('<style id="customcss"></style>');
|
||||
}
|
||||
|
||||
SettingsPanel.prototype.show = function() {
|
||||
this.getPanel().toggle();
|
||||
var settingsLi = $("#tc-settings-li");
|
||||
$("#customcss").html(css);
|
||||
|
||||
settingsLi.removeClass();
|
||||
if(this.getPanel().is(":visible")) {
|
||||
settingsLi.addClass("active");
|
||||
localStorage.setItem("bdcustomcss", btoa(css));
|
||||
};
|
||||
|
||||
var customCssInitialized = false;
|
||||
var lastTab = "";
|
||||
|
||||
SettingsPanel.prototype.changeTab = function(tab) {
|
||||
|
||||
var self = this;
|
||||
|
||||
lastTab = tab;
|
||||
|
||||
var controlGroups = $("#bd-control-groups");
|
||||
$(".bd-tab").removeClass("selected");
|
||||
$(".bd-pane").hide();
|
||||
$("#" + tab).addClass("selected");
|
||||
$("#" + tab.replace("tab", "pane")).show();
|
||||
|
||||
switch(tab) {
|
||||
case "bd-settings-tab":
|
||||
break;
|
||||
case "bd-customcss-tab":
|
||||
if(!customCssInitialized) {
|
||||
var editor = CodeMirror.fromTextArea(document.getElementById("bd-custom-css-ta"), {
|
||||
lineNumbers: true, mode: 'css', indentUnit: 4, theme: 'neat'
|
||||
});
|
||||
|
||||
|
||||
editor.on("change", function(cm) {
|
||||
var css = cm.getValue();
|
||||
self.applyCustomCss(css);
|
||||
});
|
||||
|
||||
customCssInitialized = true;
|
||||
}
|
||||
break;
|
||||
case "bd-plugins-tab":
|
||||
|
||||
break;
|
||||
case "bd-themes-tab":
|
||||
controlGroups.html("<span>Coming soon</span>");
|
||||
break;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
SettingsPanel.prototype.handler = function(e){
|
||||
var sid = e.attr("id");
|
||||
var enabled = settingsCookie[sid];
|
||||
enabled = !enabled;
|
||||
settingsCookie[sid] = enabled;
|
||||
SettingsPanel.prototype.updateSetting = function(checkbox) {
|
||||
var cb = $(checkbox).children().find('input[type="checkbox"]');
|
||||
var enabled = !cb.is(":checked");
|
||||
var id = cb.attr("id");
|
||||
cb.prop("checked", enabled);
|
||||
|
||||
var swoff = $("#" + sid + " .tc-switch-off");
|
||||
var swon = $("#" + sid + " .tc-switch-on");
|
||||
swoff.removeClass("active");
|
||||
swon.removeClass("active");
|
||||
settingsCookie[id] = enabled;
|
||||
|
||||
if(enabled) {
|
||||
swon.addClass("active");
|
||||
} else {
|
||||
swoff.addClass("active");
|
||||
if(settingsCookie["bda-es-0"]) {
|
||||
$("#twitchcord-button-container").show();
|
||||
} else {
|
||||
$("#twitchcord-button-container").hide();
|
||||
}
|
||||
|
||||
if(settingsCookie["bda-gs-2"]) {
|
||||
$("body").addClass("bd-minimal");
|
||||
} else {
|
||||
$("body").removeClass("bd-minimal");
|
||||
}
|
||||
if(settingsCookie["bda-gs-3"]) {
|
||||
$("body").addClass("bd-minimal-chan");
|
||||
} else {
|
||||
$("body").removeClass("bd-minimal-chan");
|
||||
}
|
||||
if(settingsCookie["bda-gs-1"]) {
|
||||
$("#bd-pub-li").show();
|
||||
} else {
|
||||
$("#bd-pub-li").hide();
|
||||
}
|
||||
if(settingsCookie["bda-gs-4"]){
|
||||
voiceMode.enable();
|
||||
} else {
|
||||
voiceMode.disable();
|
||||
}
|
||||
if (settingsCookie["bda-es-6"]) {
|
||||
//Pretty emote titles
|
||||
emoteNamePopup = $("<div class='tipsy tipsy-se' style='display: block; top: 82px; left: 1630.5px; visibility: visible; opacity: 0.8;'><div class='tipsy-inner'></div></div>");
|
||||
$(document).on("mouseover", ".emote", function() { var x = $(this).offset(); var title = $(this).attr("alt"); $(emoteNamePopup).find(".tipsy-inner").text(title); $(emoteNamePopup).css('left', x.left - 25); $(emoteNamePopup).css('top', x.top - 32); $("div[data-reactid='.0.1.1']").append($(emoteNamePopup));});
|
||||
$(document).on("mouseleave", ".emote", function(){$(".tipsy").remove()});
|
||||
} else {
|
||||
$(document).off('mouseover', '.emote');
|
||||
}
|
||||
|
||||
mainCore.saveSettings();
|
||||
}
|
||||
|
||||
SettingsPanel.prototype.construct = function() {
|
||||
var self = this;
|
||||
|
||||
panel = $("<div/>", {
|
||||
id: "bd-pane",
|
||||
class: "settings-inner",
|
||||
css: {
|
||||
"display": "none"
|
||||
}
|
||||
});
|
||||
|
||||
var settingsInner = '' +
|
||||
'<div class="scroller-wrap">' +
|
||||
' <div class="scroller settings-wrapper settings-panel">' +
|
||||
' <div class="tab-bar TOP">' +
|
||||
' <div class="tab-bar-item bd-tab" id="bd-settings-tab" onclick="settingsPanel.changeTab(\'bd-settings-tab\');">Settings</div>' +
|
||||
' <div class="tab-bar-item bd-tab" id="bd-customcss-tab" onclick="settingsPanel.changeTab(\'bd-customcss-tab\');">Custom CSS</div>' +
|
||||
' <div class="tab-bar-item bd-tab" id="bd-plugins-tab" onclick="settingsPanel.changeTab(\'bd-plugins-tab\');">Plugins</div>' +
|
||||
' <div class="tab-bar-item bd-tab" id="bd-themes-tab" onclick="settingsPanel.changeTab(\'bd-themes-tab\');">Themes</div>' +
|
||||
' </div>' +
|
||||
' <div class="bd-settings">' +
|
||||
'' +
|
||||
' <div class="bd-pane control-group" id="bd-settings-pane" style="display:none;">' +
|
||||
' <ul class="checkbox-group">';
|
||||
|
||||
|
||||
|
||||
for(var setting in settings) {
|
||||
|
||||
var sett = settings[setting];
|
||||
var id = sett["id"];
|
||||
|
||||
if(sett["implemented"]) {
|
||||
|
||||
settingsInner += '' +
|
||||
'<li>' +
|
||||
'<div class="checkbox" onclick="settingsPanel.updateSetting(this);" >' +
|
||||
'<div class="checkbox-inner">' +
|
||||
'<input type="checkbox" id="'+id+ '" ' + (settingsCookie[id] ? "checked" : "") + '>' +
|
||||
'<span></span>' +
|
||||
'</div>' +
|
||||
'<span>' + setting + " - " + sett["info"] +
|
||||
'</span>' +
|
||||
'</div>' +
|
||||
'</li>';
|
||||
}
|
||||
}
|
||||
|
||||
var ccss = atob(localStorage.getItem("bdcustomcss"));
|
||||
self.applyCustomCss(ccss);
|
||||
|
||||
settingsInner += '</ul>' +
|
||||
' </div>' +
|
||||
'' +
|
||||
' <div class="bd-pane control-group" id="bd-customcss-pane" style="display:none;">' +
|
||||
' <textarea id="bd-custom-css-ta">'+ccss+'</textarea>' +
|
||||
' </div>' +
|
||||
'' +
|
||||
' <div class="bd-pane control-group" id="bd-plugins-pane" style="display:none;">' +
|
||||
' <table class="bd-g-table">' +
|
||||
' <thead><tr><th>Name</th><th>Description</th><th>Author</th><th>Version</th><th></th></tr></thead><tbody>';
|
||||
|
||||
$.each(bdplugins, function() {
|
||||
var plugin = this["plugin"];
|
||||
settingsInner += '' +
|
||||
'<tr>' +
|
||||
' <td>'+plugin.getName()+'</td>' +
|
||||
' <td width="99%"><textarea>'+plugin.getDescription()+'</textarea></td>' +
|
||||
' <td>'+plugin.getAuthor()+'</td>' +
|
||||
' <td>'+plugin.getVersion()+'</td>' +
|
||||
' <td>' +
|
||||
' <div class="checkbox" onclick="pluginModule.handlePlugin(this);">' +
|
||||
' <div class="checkbox-inner">' +
|
||||
' <input id="'+plugin.getName()+'" type="checkbox" ' + (pluginCookie[plugin.getName()] ? "checked" : "") +'>' +
|
||||
' <span></span>' +
|
||||
' </div>' +
|
||||
' </div>' +
|
||||
' </td>' +
|
||||
'</tr>';
|
||||
});
|
||||
|
||||
settingsInner += '</tbody></table>' +
|
||||
' </div>' +
|
||||
' <div class="bd-pane control-group" id="bd-themes-pane" style="display:none;">';
|
||||
|
||||
|
||||
if(typeof(themesupport2) === "undefined") {
|
||||
settingsInner += '' +
|
||||
' Your version does not support themes. Download the latest version.';
|
||||
}else {
|
||||
settingsInner += '' +
|
||||
' <table class="bd-g-table">' +
|
||||
' <thead><tr><th>Name</th><th>Description</th><th>Author</th><th>Version</th><th></th></tr></thead><tbody>';
|
||||
$.each(bdthemes, function() {
|
||||
settingsInner += '' +
|
||||
'<tr>' +
|
||||
' <td>'+this["name"]+'</td>' +
|
||||
' <td width="99%"><textarea>'+this["description"]+'</textarea></td>' +
|
||||
' <td>'+this["author"]+'</td>' +
|
||||
' <td>'+this["version"]+'</td>' +
|
||||
' <td>' +
|
||||
' <div class="checkbox" onclick="themeModule.handleTheme(this);">' +
|
||||
' <div class="checkbox-inner">' +
|
||||
' <input id="ti'+this["name"]+'" type="checkbox" ' + (themeCookie[this["name"]] ? "checked" : "") +'>' +
|
||||
' <span></span>' +
|
||||
' </div>' +
|
||||
' </div>' +
|
||||
' </td>' +
|
||||
'</tr>';
|
||||
});
|
||||
settingsInner += '</tbody></table>';
|
||||
}
|
||||
|
||||
|
||||
settingsInner += '' +
|
||||
' </div>' +
|
||||
'' +
|
||||
' </div>' +
|
||||
' </div>' +
|
||||
'</div>';
|
||||
|
||||
function showSettings() {
|
||||
$(".tab-bar-item").removeClass("selected");
|
||||
settingsButton.addClass("selected");
|
||||
$(".form .settings-right .settings-inner").first().hide();
|
||||
panel.show();
|
||||
if(lastTab == "") {
|
||||
self.changeTab("bd-settings-tab");
|
||||
} else {
|
||||
self.changeTab(lastTab);
|
||||
}
|
||||
}
|
||||
|
||||
settingsButton = $("<div/>", {
|
||||
class: "tab-bar-item",
|
||||
text: "BetterDiscord",
|
||||
id: "bd-settings-new",
|
||||
click: showSettings
|
||||
});
|
||||
|
||||
if(settingsCookie["bda-es-0"]) {
|
||||
$("#twitchcord-button-container").show();
|
||||
} else {
|
||||
$("#twitchcord-button-container").hide();
|
||||
}
|
||||
panel.html(settingsInner);
|
||||
|
||||
if(settingsCookie["bda-gs-2"]) {
|
||||
$("body").addClass("bd-minimal");
|
||||
} else {
|
||||
$("body").removeClass("bd-minimal");
|
||||
}
|
||||
if(settingsCookie["bda-gs-3"]) {
|
||||
$("body").addClass("bd-minimal-chan");
|
||||
} else {
|
||||
$("body").removeClass("bd-minimal-chan");
|
||||
}
|
||||
if(settingsCookie["bda-gs-1"]) {
|
||||
$("#bd-pub-li").show();
|
||||
} else {
|
||||
$("#bd-pub-li").hide();
|
||||
}
|
||||
if(settingsCookie["bda-gs-4"]){
|
||||
voiceMode.enable();
|
||||
} else {
|
||||
voiceMode.disable();
|
||||
}
|
||||
function defer() {
|
||||
if($(".btn.btn-settings").length < 1) {
|
||||
setTimeout(defer, 100);
|
||||
}else {
|
||||
$(".btn.btn-settings").first().on("click", function() {
|
||||
|
||||
mainCore.saveSettings();
|
||||
function innerDefer() {
|
||||
if($(".modal-inner").first().is(":visible")) {
|
||||
|
||||
panel.hide();
|
||||
var tabBar = $(".tab-bar.SIDE").first();
|
||||
|
||||
$(".tab-bar.SIDE .tab-bar-item").click(function() {
|
||||
$(".form .settings-right .settings-inner").first().show();
|
||||
$("#bd-settings-new").removeClass("selected");
|
||||
panel.hide();
|
||||
});
|
||||
|
||||
tabBar.append(settingsButton);
|
||||
panel.insertAfter(".form .settings-right .settings-inner");
|
||||
$("#bd-settings-new").removeClass("selected");
|
||||
} else {
|
||||
setTimeout(innerDefer, 100);
|
||||
}
|
||||
}
|
||||
innerDefer();
|
||||
});
|
||||
}
|
||||
}
|
||||
defer();
|
||||
|
||||
};
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
/* BetterDiscordApp ThemeModule JavaScript
|
||||
* Version: 1.0
|
||||
* Author: Jiiks | http://jiiks.net
|
||||
* Date: 16/12/2015
|
||||
* https://github.com/Jiiks/BetterDiscordApp
|
||||
*/
|
||||
|
||||
var themeCookie = {};
|
||||
|
||||
function ThemeModule() {
|
||||
|
||||
}
|
||||
|
||||
ThemeModule.prototype.loadThemes = function() {
|
||||
this.loadThemeData();
|
||||
|
||||
$.each(bdthemes, function() {
|
||||
var name = this["name"];
|
||||
var enabled = false;
|
||||
if(themeCookie.hasOwnProperty(name)) {
|
||||
if(themeCookie[name]) {
|
||||
enabled = true;
|
||||
}
|
||||
} else {
|
||||
themeCookie[name] = false;
|
||||
}
|
||||
|
||||
if(enabled) {
|
||||
$("head").append('<style id="'+name+'">'+unescape(bdthemes[name]["css"])+'</style>');
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
ThemeModule.prototype.handleTheme = function(checkbox) {
|
||||
|
||||
var cb = $(checkbox).children().find('input[type="checkbox"]');
|
||||
var enabled = !cb.is(":checked");
|
||||
var id = cb.attr("id").substring(2);
|
||||
cb.prop("checked", enabled);
|
||||
|
||||
if(enabled) {
|
||||
$("head").append('<style id="'+id+'">'+unescape(bdthemes[id]["css"])+'</style>');
|
||||
themeCookie[id] = true;
|
||||
} else {
|
||||
$("#"+id).remove();
|
||||
themeCookie[id] = false;
|
||||
}
|
||||
|
||||
this.saveThemeData();
|
||||
};
|
||||
|
||||
ThemeModule.prototype.loadThemeData = function() {
|
||||
var cookie = $.cookie("bd-themes");
|
||||
if(cookie != undefined) {
|
||||
themeCookie = JSON.parse($.cookie("bd-themes"));
|
||||
}
|
||||
};
|
||||
|
||||
ThemeModule.prototype.saveThemeData = function() {
|
||||
$.cookie("bd-themes", JSON.stringify(themeCookie), { expires: 365, path: '/' });
|
||||
};
|
||||
29
js/utils.js
29
js/utils.js
|
|
@ -6,7 +6,6 @@
|
|||
*/
|
||||
|
||||
var _hash;
|
||||
|
||||
function Utils() {
|
||||
|
||||
}
|
||||
|
|
@ -20,8 +19,34 @@ Utils.prototype.jqDefer = function(fnc) {
|
|||
};
|
||||
|
||||
Utils.prototype.getHash = function() {
|
||||
$.getJson("https://api.github.com/repos/Jiiks/BetterDiscordApp/commits/master", function(data) {
|
||||
$.getJSON("https://api.github.com/repos/Jiiks/BetterDiscordApp/commits/master", function(data) {
|
||||
_hash = data.sha;
|
||||
emoteModule.getBlacklist();
|
||||
});
|
||||
};
|
||||
|
||||
Utils.prototype.loadHtml = function(html, callback) {
|
||||
var container = $("<div/>", {
|
||||
class: "bd-container"
|
||||
}).appendTo("body");
|
||||
|
||||
//TODO Inject these in next core update
|
||||
html = '//cdn.rawgit.com/Jiiks/BetterDiscordApp/' + _hash + '/html/' + html + '.html';
|
||||
|
||||
container.load(html, callback());
|
||||
};
|
||||
|
||||
Utils.prototype.injectJs = function(uri) {
|
||||
$("<script/>", {
|
||||
type: "text/javascript",
|
||||
src: uri
|
||||
}).appendTo($("body"));
|
||||
};
|
||||
|
||||
Utils.prototype.injectCss = function(uri) {
|
||||
$("<link/>", {
|
||||
type: "text/css",
|
||||
rel: "stylesheet",
|
||||
href: uri
|
||||
}).appendTo($("head"));
|
||||
};
|
||||
|
|
@ -9,20 +9,32 @@ function VoiceMode() {
|
|||
|
||||
}
|
||||
|
||||
VoiceMode.prototype.obsCallback = function() {
|
||||
var self = this;
|
||||
if(settingsCookie["bda-gs-4"]) {
|
||||
self.disable();
|
||||
setTimeout(function() {
|
||||
self.enable();
|
||||
}, 300);
|
||||
}
|
||||
}
|
||||
|
||||
VoiceMode.prototype.enable = function() {
|
||||
$(".scroller.guild-channels ul").first().css("display", "none");
|
||||
$(".scroller.guild-channels header").first().css("display", "none");
|
||||
$(".flex-vertical.flex-spacer").first().css("overflow", "hidden");
|
||||
$(".app.flex-vertical").first().css("overflow", "hidden");
|
||||
$(".chat.flex-vertical.flex-spacer").first().css("visibility", "hidden").css("min-width", "0px");
|
||||
$(".flex-vertical.channels-wrap").first().css("width", "100%");
|
||||
$(".flex-vertical.channels-wrap").first().css("flex-grow", "100000");
|
||||
$(".guild-header .btn.btn-hamburger").first().css("visibility", "hidden");
|
||||
};
|
||||
|
||||
VoiceMode.prototype.disable = function() {
|
||||
$(".scroller.guild-channels ul").first().css("display", "");
|
||||
$(".scroller.guild-channels header").first().css("display", "");
|
||||
$(".flex-vertical.flex-spacer").first().css("overflow", "");
|
||||
$(".app.flex-vertical").first().css("overflow", "");
|
||||
$(".chat.flex-vertical.flex-spacer").first().css("visibility", "").css("min-width", "");
|
||||
$(".flex-vertical.channels-wrap").first().css("width", "");
|
||||
$(".flex-vertical.channels-wrap").first().css("flex-grow", "");
|
||||
$(".guild-header .btn.btn-hamburger").first().css("visibility", "");
|
||||
};
|
||||
};
|
||||
|
||||
var pluginCookie = {};
|
||||
Loading…
Reference in New Issue