Renaming and updated gruntfile
This commit is contained in:
Jiiks
parent
12122cc2cd
commit
8a15d57e39
|
|
@ -22,9 +22,13 @@ module.exports = function(grunt) {
|
|||
}
|
||||
},
|
||||
uglify: {
|
||||
options: {
|
||||
screwIE8: true
|
||||
},
|
||||
js: {
|
||||
src: 'js/main.js',
|
||||
dest: 'js/main.min.js'
|
||||
files: {
|
||||
'js/main.min.js': ['js/main.js']
|
||||
}
|
||||
}
|
||||
},
|
||||
cssmin: {
|
||||
|
|
|
|||
150
dev/js/00core.js
150
dev/js/00core.js
|
|
@ -5,152 +5,31 @@
|
|||
* Last Update: 02/04/2016
|
||||
* https://github.com/Jiiks/BetterDiscordApp
|
||||
*/
|
||||
|
||||
var BD;
|
||||
|
||||
var settingsPanel, emoteModule, utils, quickEmoteMenu, opublicServers, voiceMode, pluginModule, themeModule, customCssEditor;
|
||||
var jsVersion = 1.63;
|
||||
var supportedVersion = "0.2.5";
|
||||
|
||||
var mainObserver;
|
||||
|
||||
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 = "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, "hidden": false, "cat": "core"},
|
||||
"Public Servers": { "id": "bda-gs-1", "info": "Display public servers button", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Minimal Mode": { "id": "bda-gs-2", "info": "Hide elements and reduce the size of elements.", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Voice Mode": { "id": "bda-gs-4", "info": "Only show voice chat", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Hide Channels": { "id": "bda-gs-3", "info": "Hide channels in minimal mode", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Dark Mode": { "id": "bda-gs-5", "info": "Make certain elements dark by default(wip)", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Override Default Emotes": { "id": "bda-es-5", "info": "Override default emotes", "implemented": false, "hidden": false, "cat": "core"},
|
||||
"Voice Disconnect": { "id": "bda-dc-0", "info": "Disconnect from voice server when closing Discord", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Custom css live update": { "id": "bda-css-0", "info": "", "implemented": true, "hidden": true , "cat": "core"},
|
||||
"Custom css auto udpate": { "id": "bda-css-1", "info": "", "implemented": true, "hidden": true , "cat": "core"},
|
||||
|
||||
"Show Emotes": { "id": "bda-es-7", "info": "Show any emotes", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"FrankerFaceZ Emotes": { "id": "bda-es-1", "info": "Show FrankerFaceZ Emotes", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"BetterTTV Emotes": { "id": "bda-es-2", "info": "Show BetterTTV Emotes", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Emote Menu": { "id": "bda-es-0", "info": "Show Twitch/Favourite emotes in emote menu", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Emoji Menu": { "id": "bda-es-9", "info": "Show Discord emoji menu", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Emote Autocomplete": { "id": "bda-es-3", "info": "Autocomplete emote commands", "implemented": false, "hidden": false, "cat": "emote"},
|
||||
"Emote Auto Capitalization": { "id": "bda-es-4", "info": "Autocapitalize emote commands", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Show Names": { "id": "bda-es-6", "info": "Show emote names on hover", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Show emote modifiers": { "id": "bda-es-8", "info": "Enable emote mods", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
};
|
||||
|
||||
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-gs-5": true,
|
||||
"bda-es-0": true,
|
||||
"bda-es-1": true,
|
||||
"bda-es-2": true,
|
||||
"bda-es-3": false,
|
||||
"bda-es-4": false,
|
||||
"bda-es-5": true,
|
||||
"bda-es-6": true,
|
||||
"bda-es-7": true,
|
||||
"bda-es-8": true,
|
||||
"bda-jd": true,
|
||||
"bda-es-8": true,
|
||||
"bda-dc-0": false,
|
||||
"bda-css-0": false,
|
||||
"bda-css-1": false,
|
||||
"bda-es-9": true
|
||||
};
|
||||
|
||||
var bdchangelog = {
|
||||
"changes": {
|
||||
"darkmode": {
|
||||
"title": "v1.63 : Dark Mode",
|
||||
"text": "Dark mode makes certain elements dark by default(currently only applies to emote menu)",
|
||||
"img": ""
|
||||
},
|
||||
"emotemenu": {
|
||||
"title": "v1.62 : Brand new emote menu that fits in Discord emoji menu!",
|
||||
"text": "The emote menu has been replaced by a new one that injects itself in the Discord emoji menu!",
|
||||
"img": ""
|
||||
},
|
||||
"cccss": {
|
||||
"title": "v1.61 : New custom CSS editor",
|
||||
"text": "The custom CSS editor now has options and can be detached!",
|
||||
"img": ""
|
||||
},
|
||||
"vdc": {
|
||||
"title": "v1.61 : Voice Disconnect",
|
||||
"text": "Disconnect from voice server when closing Discord!",
|
||||
"img": ""
|
||||
},
|
||||
"pslist": {
|
||||
"title": "v1.60 : New public server list!",
|
||||
"text": 'New and shiny public server list powered by <a href="https://www.discordservers.com/" target="_blank">DiscordServers.com</a>!',
|
||||
"img": ""
|
||||
},
|
||||
"api": {
|
||||
"title": "v1.59 : New plugin api callback",
|
||||
"text": "Use the `observer(e)` callback instead of creating your own MutationObserver",
|
||||
"img": ""
|
||||
},
|
||||
"emotemods": {
|
||||
"title": "v1.59 : New emote mods!",
|
||||
"text": "The following emote mods have been added: :shake2, :shake3, :flap",
|
||||
"img": ""
|
||||
},
|
||||
"minmode": {
|
||||
"title": "v1.59: Minimal mode",
|
||||
"text": "Minimal mode embed fixed size has been removed",
|
||||
"img": ""
|
||||
}
|
||||
},
|
||||
"fixes": {
|
||||
"modal": {
|
||||
"title": "v1.62 : Fixed modals",
|
||||
"text": "Fixed broken modal introduced by 0.0.287",
|
||||
"imt": ""
|
||||
},
|
||||
"emotes": {
|
||||
"title": "v1.59 : Native sub emote mods",
|
||||
"text": "Emote mods now work with native sub emotes!",
|
||||
"img": ""
|
||||
},
|
||||
"emotes2": {
|
||||
"title": "v1.59 : Emote mods and custom emotes",
|
||||
"text": "Emote mods will no longer interfere with custom emotes using :",
|
||||
"img": ""
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var settingsCookie = {};
|
||||
|
||||
function Core() {}
|
||||
function Core() {
|
||||
BD = this;
|
||||
}
|
||||
|
||||
Core.prototype.init = function () {
|
||||
var self = this;
|
||||
|
||||
if (version < supportedVersion) {
|
||||
this.alert("Not Supported", "BetterDiscord v" + version + "(your version)" + " is not supported by the latest js(" + jsVersion + ").<br><br> Please download the latest version from <a href='https://betterdiscord.net' target='_blank'>BetterDiscord.net</a>");
|
||||
this.version = version;
|
||||
this.jsVersion = jsVersion;
|
||||
if (this.version < supportedVersion) {
|
||||
this.alert("Not Supported", "BetterDiscord v" + this.version + "(your version)" + " is not supported by the latest js(" + this.jsVersion + ").<br><br> Please download the latest version from <a href='https://betterdiscord.net' target='_blank'>BetterDiscord.net</a>");
|
||||
return;
|
||||
}
|
||||
|
||||
this.utils = new Utils();
|
||||
|
||||
utils = new Utils();
|
||||
var sock = new BdWSocket();
|
||||
sock.start();
|
||||
utils.getHash();
|
||||
emoteModule = new EmoteModule();
|
||||
quickEmoteMenu = new QuickEmoteMenu();
|
||||
|
|
@ -261,7 +140,6 @@ Core.prototype.loadSettings = function () {
|
|||
settingsCookie = JSON.parse($.cookie("better-discord"));
|
||||
};
|
||||
|
||||
var botlist = ["119598467310944259"]; //Temp
|
||||
Core.prototype.initObserver = function () {
|
||||
mainObserver = new MutationObserver(function (mutations) {
|
||||
mutations.forEach(function (mutation) {
|
||||
|
|
@ -391,4 +269,8 @@ Core.prototype.alert = function (title, text) {
|
|||
' </div>' +
|
||||
' </div>' +
|
||||
'</div>');
|
||||
};
|
||||
|
||||
Core.prototype.getUtils = function() {
|
||||
return this.utils;
|
||||
};
|
||||
|
|
@ -0,0 +1,463 @@
|
|||
/* BetterDiscordApp Core JavaScript
|
||||
* Version: 1.53
|
||||
* Author: Jiiks | http://jiiks.net
|
||||
* Date: 27/08/2015 - 16:36
|
||||
* Last Update: 02/04/2016
|
||||
* https://github.com/Jiiks/BetterDiscordApp
|
||||
*/
|
||||
|
||||
var BD;
|
||||
|
||||
var settingsPanel, emoteModule, utils, quickEmoteMenu, opublicServers, voiceMode, pluginModule, themeModule, customCssEditor;
|
||||
var jsVersion = 1.63;
|
||||
var supportedVersion = "0.2.5";
|
||||
|
||||
var mainObserver;
|
||||
|
||||
var mainCore;
|
||||
|
||||
|
||||
|
||||
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 bdConfig = (function() {
|
||||
|
||||
return {
|
||||
versionInfo: {
|
||||
version: 1.63,
|
||||
supportedVersion: "0.2.5"
|
||||
},
|
||||
defaults: {
|
||||
"version": 1.63,
|
||||
"bda-gs-0": false,
|
||||
"bda-gs-1": true,
|
||||
"bda-gs-2": false,
|
||||
"bda-gs-3": false,
|
||||
"bda-gs-4": false,
|
||||
"bda-gs-5": true,
|
||||
"bda-es-0": true,
|
||||
"bda-es-1": true,
|
||||
"bda-es-2": true,
|
||||
"bda-es-3": false,
|
||||
"bda-es-4": false,
|
||||
"bda-es-5": true,
|
||||
"bda-es-6": true,
|
||||
"bda-es-7": true,
|
||||
"bda-es-8": true,
|
||||
"bda-jd": true,
|
||||
"bda-es-8": true,
|
||||
"bda-dc-0": false,
|
||||
"bda-css-0": false,
|
||||
"bda-css-1": false,
|
||||
"bda-es-9": true
|
||||
},
|
||||
options: {
|
||||
"Save logs locally": { "id": "bda-gs-0", "info": "Saves chat logs locally", "implemented": false, "hidden": false, "cat": "core"},
|
||||
"Public Servers": { "id": "bda-gs-1", "info": "Display public servers button", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Minimal Mode": { "id": "bda-gs-2", "info": "Hide elements and reduce the size of elements.", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Voice Mode": { "id": "bda-gs-4", "info": "Only show voice chat", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Hide Channels": { "id": "bda-gs-3", "info": "Hide channels in minimal mode", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Dark Mode": { "id": "bda-gs-5", "info": "Make certain elements dark by default(wip)", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Override Default Emotes": { "id": "bda-es-5", "info": "Override default emotes", "implemented": false, "hidden": false, "cat": "core"},
|
||||
"Voice Disconnect": { "id": "bda-dc-0", "info": "Disconnect from voice server when closing Discord", "implemented": true, "hidden": false, "cat": "core"},
|
||||
"Custom css live update": { "id": "bda-css-0", "info": "", "implemented": true, "hidden": true , "cat": "core"},
|
||||
"Custom css auto udpate": { "id": "bda-css-1", "info": "", "implemented": true, "hidden": true , "cat": "core"},
|
||||
|
||||
"Show Emotes": { "id": "bda-es-7", "info": "Show any emotes", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"FrankerFaceZ Emotes": { "id": "bda-es-1", "info": "Show FrankerFaceZ Emotes", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"BetterTTV Emotes": { "id": "bda-es-2", "info": "Show BetterTTV Emotes", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Emote Menu": { "id": "bda-es-0", "info": "Show Twitch/Favourite emotes in emote menu", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Emoji Menu": { "id": "bda-es-9", "info": "Show Discord emoji menu", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Emote Autocomplete": { "id": "bda-es-3", "info": "Autocomplete emote commands", "implemented": false, "hidden": false, "cat": "emote"},
|
||||
"Emote Auto Capitalization": { "id": "bda-es-4", "info": "Autocapitalize emote commands", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Show Names": { "id": "bda-es-6", "info": "Show emote names on hover", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
"Show emote modifiers": { "id": "bda-es-8", "info": "Enable emote mods", "implemented": true, "hidden": false, "cat": "emote"},
|
||||
},
|
||||
links: {
|
||||
"Jiiks.net": { "text": "Jiiks.net", "href": "https://jiiks.net", "target": "_blank" },
|
||||
"twitter": { "text": "Twitter", "href": "https://twitter.com/jiiksi", "target": "_blank" },
|
||||
"github": { "text": "Github", "href": "https://github.com/jiiks", "target": "_blank" },
|
||||
"betterdiscord.net": { "text": "BetterDiscord.net", "href": "https://betterdiscord.net", "target": "_blank" }
|
||||
},
|
||||
urls: {
|
||||
twitch: {
|
||||
home: "https://twitch.tv/",
|
||||
emotes: {
|
||||
start: "https://static-cdn.jtvnw.net/emoticons/v1/",
|
||||
end: "/1.0"
|
||||
}
|
||||
},
|
||||
bttv: {
|
||||
home: "https://betterttv.net",
|
||||
emotes: {
|
||||
start: "https://cdn.betterttv.net/emote/",
|
||||
end: "/1x"
|
||||
}
|
||||
},
|
||||
ffz: {
|
||||
home: "https://frankerfacez.com/",
|
||||
emotes: {
|
||||
start: "https://cdn.frankerfacez.com/emoticon/",
|
||||
end: "/1"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
})();
|
||||
|
||||
|
||||
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-gs-5": true,
|
||||
"bda-es-0": true,
|
||||
"bda-es-1": true,
|
||||
"bda-es-2": true,
|
||||
"bda-es-3": false,
|
||||
"bda-es-4": false,
|
||||
"bda-es-5": true,
|
||||
"bda-es-6": true,
|
||||
"bda-es-7": true,
|
||||
"bda-es-8": true,
|
||||
"bda-jd": true,
|
||||
"bda-es-8": true,
|
||||
"bda-dc-0": false,
|
||||
"bda-css-0": false,
|
||||
"bda-css-1": false,
|
||||
"bda-es-9": true
|
||||
};
|
||||
|
||||
var bdchangelog = {
|
||||
"changes": {
|
||||
"darkmode": {
|
||||
"title": "v1.63 : Dark Mode",
|
||||
"text": "Dark mode makes certain elements dark by default(currently only applies to emote menu)",
|
||||
"img": ""
|
||||
},
|
||||
"emotemenu": {
|
||||
"title": "v1.62 : Brand new emote menu that fits in Discord emoji menu!",
|
||||
"text": "The emote menu has been replaced by a new one that injects itself in the Discord emoji menu!",
|
||||
"img": ""
|
||||
},
|
||||
"cccss": {
|
||||
"title": "v1.61 : New custom CSS editor",
|
||||
"text": "The custom CSS editor now has options and can be detached!",
|
||||
"img": ""
|
||||
},
|
||||
"vdc": {
|
||||
"title": "v1.61 : Voice Disconnect",
|
||||
"text": "Disconnect from voice server when closing Discord!",
|
||||
"img": ""
|
||||
},
|
||||
"pslist": {
|
||||
"title": "v1.60 : New public server list!",
|
||||
"text": 'New and shiny public server list powered by <a href="https://www.discordservers.com/" target="_blank">DiscordServers.com</a>!',
|
||||
"img": ""
|
||||
},
|
||||
"api": {
|
||||
"title": "v1.59 : New plugin api callback",
|
||||
"text": "Use the `observer(e)` callback instead of creating your own MutationObserver",
|
||||
"img": ""
|
||||
},
|
||||
"emotemods": {
|
||||
"title": "v1.59 : New emote mods!",
|
||||
"text": "The following emote mods have been added: :shake2, :shake3, :flap",
|
||||
"img": ""
|
||||
},
|
||||
"minmode": {
|
||||
"title": "v1.59: Minimal mode",
|
||||
"text": "Minimal mode embed fixed size has been removed",
|
||||
"img": ""
|
||||
}
|
||||
},
|
||||
"fixes": {
|
||||
"modal": {
|
||||
"title": "v1.62 : Fixed modals",
|
||||
"text": "Fixed broken modal introduced by 0.0.287",
|
||||
"imt": ""
|
||||
},
|
||||
"emotes": {
|
||||
"title": "v1.59 : Native sub emote mods",
|
||||
"text": "Emote mods now work with native sub emotes!",
|
||||
"img": ""
|
||||
},
|
||||
"emotes2": {
|
||||
"title": "v1.59 : Emote mods and custom emotes",
|
||||
"text": "Emote mods will no longer interfere with custom emotes using :",
|
||||
"img": ""
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var settingsCookie = {};
|
||||
|
||||
function Core() {
|
||||
BD = this;
|
||||
}
|
||||
|
||||
Core.prototype.init = function () {
|
||||
var self = this;
|
||||
this.version = version;
|
||||
this.jsVersion = jsVersion;
|
||||
if (this.version < supportedVersion) {
|
||||
this.alert("Not Supported", "BetterDiscord v" + this.version + "(your version)" + " is not supported by the latest js(" + this.jsVersion + ").<br><br> Please download the latest version from <a href='https://betterdiscord.net' target='_blank'>BetterDiscord.net</a>");
|
||||
return;
|
||||
}
|
||||
|
||||
this.utils = new Utils();
|
||||
|
||||
utils = new Utils();
|
||||
utils.getHash();
|
||||
emoteModule = new EmoteModule();
|
||||
quickEmoteMenu = new QuickEmoteMenu();
|
||||
voiceMode = new VoiceMode();
|
||||
|
||||
emoteModule.init();
|
||||
|
||||
this.initSettings();
|
||||
this.initObserver();
|
||||
|
||||
//Incase were too fast
|
||||
function gwDefer() {
|
||||
console.log(new Date().getTime() + " Defer");
|
||||
if ($(".guilds-wrapper .guilds").children().length > 0) {
|
||||
console.log(new Date().getTime() + " Defer Loaded");
|
||||
var guilds = $(".guilds>li:first-child");
|
||||
|
||||
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();
|
||||
customCssEditor = new CustomCssEditor();
|
||||
pluginModule = new PluginModule();
|
||||
pluginModule.loadPlugins();
|
||||
if (typeof (themesupport2) !== "undefined") {
|
||||
themeModule = new ThemeModule();
|
||||
themeModule.loadThemes();
|
||||
}
|
||||
|
||||
settingsPanel = new SettingsPanel();
|
||||
settingsPanel.init();
|
||||
|
||||
quickEmoteMenu.init(false);
|
||||
|
||||
$("#tc-settings-button").on("click", function () {
|
||||
settingsPanel.show();
|
||||
});
|
||||
|
||||
window.addEventListener("beforeunload", function(){
|
||||
if(settingsCookie["bda-dc-0"]){
|
||||
$('.btn.btn-disconnect').click();
|
||||
}
|
||||
});
|
||||
|
||||
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("<style>.CodeMirror{ min-width:100%; }</style>");
|
||||
$("head").append('<style id="bdemotemenustyle"></style>');
|
||||
|
||||
} else {
|
||||
setTimeout(gwDefer, 100);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$(document).ready(function () {
|
||||
setTimeout(gwDefer, 1000);
|
||||
});
|
||||
};
|
||||
|
||||
Core.prototype.initSettings = function () {
|
||||
if ($.cookie("better-discord") == undefined) {
|
||||
settingsCookie = defaultCookie;
|
||||
this.saveSettings();
|
||||
} else {
|
||||
this.loadSettings();
|
||||
|
||||
for (var setting in defaultCookie) {
|
||||
if (settingsCookie[setting] == undefined) {
|
||||
settingsCookie[setting] = defaultCookie[setting];
|
||||
this.saveSettings();
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Core.prototype.saveSettings = function () {
|
||||
$.cookie("better-discord", JSON.stringify(settingsCookie), {
|
||||
expires: 365,
|
||||
path: '/'
|
||||
});
|
||||
};
|
||||
|
||||
Core.prototype.loadSettings = function () {
|
||||
settingsCookie = JSON.parse($.cookie("better-discord"));
|
||||
};
|
||||
|
||||
Core.prototype.initObserver = function () {
|
||||
mainObserver = new MutationObserver(function (mutations) {
|
||||
mutations.forEach(function (mutation) {
|
||||
if($(mutation.target).find(".emoji-picker").length) {
|
||||
var fc = mutation.target.firstChild;
|
||||
if(fc.classList.contains("popout")) {
|
||||
quickEmoteMenu.obsCallback($(fc));
|
||||
}
|
||||
}
|
||||
if (typeof pluginModule !== "undefined") pluginModule.rawObserver(mutation);
|
||||
if (mutation.target.getAttribute('class') != null) {
|
||||
//console.log(mutation.target)
|
||||
if(mutation.target.classList.contains('title-wrap') || mutation.target.classList.contains('chat')){
|
||||
// quickEmoteMenu.obsCallback();
|
||||
voiceMode.obsCallback();
|
||||
if (typeof pluginModule !== "undefined") pluginModule.channelSwitch();
|
||||
}
|
||||
if (mutation.target.getAttribute('class').indexOf('scroller messages') != -1) {
|
||||
if (typeof pluginModule !== "undefined") pluginModule.newMessage();
|
||||
}
|
||||
}
|
||||
emoteModule.obsCallback(mutation);
|
||||
});
|
||||
});
|
||||
|
||||
//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="markdown-modal change-log"> ' +
|
||||
' <div class="markdown-modal-header">' +
|
||||
' <strong>What\'s new in BetterDiscord JS' + jsVersion + '</strong>' +
|
||||
' <button class="markdown-modal-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;
|
||||
};
|
||||
|
||||
Core.prototype.alert = function (title, text) {
|
||||
$("body").append('' +
|
||||
'<div class="bd-alert">' +
|
||||
' <div class="bd-alert-header">' +
|
||||
' <span>' + title + '</span>' +
|
||||
' <div class="bd-alert-closebtn" onclick="$(this).parent().parent().remove();">×</div>' +
|
||||
' </div>' +
|
||||
' <div class="bd-alert-body">' +
|
||||
' <div class="scroller-wrap dark fade">' +
|
||||
' <div class="scroller">' + text + '</div>' +
|
||||
' </div>' +
|
||||
' </div>' +
|
||||
'</div>');
|
||||
};
|
||||
|
||||
Core.prototype.getUtils = function() {
|
||||
return this.utils;
|
||||
};
|
||||
|
|
@ -26,7 +26,28 @@ var subEmotesTwitch = {};
|
|||
|
||||
function EmoteModule() {}
|
||||
|
||||
EmoteModule.prototype.init = function () {};
|
||||
EmoteModule.prototype.init = function () {
|
||||
this.config = {
|
||||
twitch: {
|
||||
url: {
|
||||
start: "https://static-cdn.jtvnw.net/emoticons/v1/",
|
||||
end: "/1.0"
|
||||
}
|
||||
},
|
||||
ffz: {
|
||||
url: {
|
||||
start: "https://cdn.frankerfacez.com/emoticon/",
|
||||
end: "/1"
|
||||
}
|
||||
},
|
||||
bttv: {
|
||||
url: {
|
||||
start: "https://cdn.betterttv.net/emote/",
|
||||
end: "/1x"
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
EmoteModule.prototype.getBlacklist = function () {
|
||||
$.getJSON("https://cdn.rawgit.com/Jiiks/betterDiscordApp/" + _hash + "/data/emotefilter.json", function (data) {
|
||||
|
|
@ -91,6 +112,8 @@ var spoilered = [];
|
|||
|
||||
EmoteModule.prototype.injectEmote = function (node) {
|
||||
|
||||
var self = this;
|
||||
|
||||
if (typeof emotesTwitch === 'undefined') return;
|
||||
|
||||
if (!node.parentElement) return;
|
||||
|
|
@ -163,36 +186,23 @@ EmoteModule.prototype.injectEmote = function (node) {
|
|||
}
|
||||
if ($.inArray(sWord, bemotes) != -1) return;
|
||||
|
||||
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 cfg = self.config;
|
||||
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;
|
||||
var url = cfg.twitch.url.start + emotesTwitch.emotes[sWord].image_id + cfg.twitch.url.end;
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="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;
|
||||
var url = cfg.twitch.url.start + subEmotesTwitch[sWord] + cfg.twitch.url.end;
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="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 '+emoteClass+'" alt="' + name + '" src="' + url + '"/><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof emotesBTTV !== 'undefined' && settingsCookie["bda-es-2"]) {
|
||||
if (emotesBTTV.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 = emotesBTTV[sWord];
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote '+emoteClass+'" alt="' + name + '" src="' + url + '"/><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
return;
|
||||
|
|
@ -201,9 +211,15 @@ EmoteModule.prototype.injectEmote = function (node) {
|
|||
|
||||
if (typeof emotesBTTV2 !== 'undefined' && settingsCookie["bda-es-2"]) {
|
||||
if (emotesBTTV2.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 = bttvEmoteUrlStart + emotesBTTV2[sWord] + bttvEmoteUrlEnd;
|
||||
var url = cfg.bttv.url.start + emotesBTTV2[sWord] + cfg.bttv.url.end;
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="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 url = cfg.ffz.url.start + emotesFfz[sWord] + cfg.ffz.url.end;
|
||||
parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote '+emoteClass+'" alt="' + name + '" src="' + url + '"/><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
|
||||
return;
|
||||
}
|
||||
|
|
@ -1,372 +0,0 @@
|
|||
/* BetterDiscordApp Settings Panel JavaScript
|
||||
* Version: 2.0
|
||||
* Author: Jiiks | http://jiiks.net
|
||||
* Date: 26/08/2015 - 11:54
|
||||
* Last Update: 27/11/2015 - 00:50
|
||||
* https://github.com/Jiiks/BetterDiscordApp
|
||||
*/
|
||||
|
||||
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");
|
||||
utils.injectJs("https://cdnjs.cloudflare.com/ajax/libs/Sortable/1.4.2/Sortable.min.js");
|
||||
}
|
||||
|
||||
SettingsPanel.prototype.init = function () {
|
||||
var self = this;
|
||||
self.construct();
|
||||
var body = $("body");
|
||||
|
||||
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-4"]) {
|
||||
voiceMode.enable();
|
||||
}
|
||||
|
||||
if(settingsCookie["bda-gs-5"]) {
|
||||
$("#app-mount").addClass("bda-dark");
|
||||
}
|
||||
|
||||
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');
|
||||
}
|
||||
};
|
||||
|
||||
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) {
|
||||
customCssEditor.init();
|
||||
customCssInitialized = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
};
|
||||
|
||||
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);
|
||||
|
||||
if(id == "bda-css-2") {
|
||||
$("#app-mount").removeClass("bd-hide-bd");
|
||||
customCssEditor.hideBackdrop = enabled;
|
||||
if(enabled) {
|
||||
$("#app-mount").addClass("bd-hide-bd")
|
||||
}
|
||||
}
|
||||
|
||||
settingsCookie[id] = enabled;
|
||||
|
||||
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();
|
||||
}
|
||||
$("#app-mount").removeClass("bda-dark");
|
||||
if(settingsCookie["bda-gs-5"]) {
|
||||
$("#app-mount").addClass("bda-dark");
|
||||
}
|
||||
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\');">Core</div>' +
|
||||
' <div class="tab-bar-item bd-tab" id="bd-emotes-tab" onclick="settingsPanel.changeTab(\'bd-emotes-tab\');">Emotes</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["cat"] != "core") continue;
|
||||
|
||||
if (sett["implemented"] && !sett["hidden"]) {
|
||||
|
||||
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>';
|
||||
}
|
||||
}
|
||||
|
||||
settingsInner += ' </ul>' +
|
||||
' </div>';
|
||||
|
||||
|
||||
settingsInner += '<div class="bd-pane control-group" id="bd-emotes-pane" style="display:none;">' +
|
||||
' <ul class="checkbox-group">';
|
||||
|
||||
for (var setting in settings) {
|
||||
|
||||
var sett = settings[setting];
|
||||
var id = sett["id"];
|
||||
if(sett["cat"] != "emote") continue;
|
||||
|
||||
if (sett["implemented"] && !sett["hidden"]) {
|
||||
|
||||
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>';
|
||||
}
|
||||
}
|
||||
|
||||
settingsInner += ' </ul>' +
|
||||
' </div>';
|
||||
|
||||
|
||||
var ccss = atob(localStorage.getItem("bdcustomcss"));
|
||||
customCssEditor.applyCustomCss(ccss, true, false);
|
||||
|
||||
settingsInner += '' +
|
||||
' <div class="bd-pane control-group" id="bd-customcss-pane" style="display:none;">' +
|
||||
' <div id="editor-detached" style="display:none;">' +
|
||||
' <h3>Editor Detached</h3>' +
|
||||
' <button class="btn btn-primary" onclick="customCssEditor.attach(); return false;">Attach</button>' +
|
||||
' </div>' +
|
||||
' <div id="bd-customcss-innerpane"><textarea id="bd-custom-css-ta">' + ccss + '</textarea></div>' +
|
||||
' </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><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><button class="bd-psb" onclick="pluginModule.showSettings(\'' + plugin.getName() + '\'); return false;"></button></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"].replace(/_/g, " ") + '</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 style="background:#2E3136; color:#ADADAD; height:30px; position:absolute; bottom:0; left:0; right:0;">' +
|
||||
' <span style="line-height:30px;margin-left:10px;">BetterDiscord v' + version + '(JSv' + jsVersion + ') by Jiiks</span>' +
|
||||
' <span style="float:right;line-height:30px;margin-right:10px;"><a href="http://betterdiscord.net" target="_blank">BetterDiscord.net</a></span>' +
|
||||
' </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
|
||||
});
|
||||
|
||||
panel.html(settingsInner);
|
||||
|
||||
function defer() {
|
||||
if ($(".btn.btn-settings").length < 1) {
|
||||
setTimeout(defer, 100);
|
||||
} else {
|
||||
$(".btn.btn-settings").first().on("click", function () {
|
||||
|
||||
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);
|
||||
$(".form .settings-right .settings-inner").last().after(panel);
|
||||
$("#bd-settings-new").removeClass("selected");
|
||||
} else {
|
||||
setTimeout(innerDefer, 100);
|
||||
}
|
||||
}
|
||||
innerDefer();
|
||||
});
|
||||
}
|
||||
}
|
||||
defer();
|
||||
};
|
||||
|
|
@ -0,0 +1,271 @@
|
|||
/* BetterDiscordApp Settings Panel JavaScript
|
||||
* Version: 2.0
|
||||
* Author: Jiiks | http://jiiks.net
|
||||
* Date: 26/08/2015 - 11:54
|
||||
* Last Update: 10/04/2016
|
||||
* https://github.com/Jiiks/BetterDiscordApp
|
||||
*/
|
||||
|
||||
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");
|
||||
utils.injectJs("https://cdnjs.cloudflare.com/ajax/libs/Sortable/1.4.2/Sortable.min.js");
|
||||
}
|
||||
|
||||
SettingsPanel.prototype.init = function () {
|
||||
var self = this;
|
||||
self.constructPanel();
|
||||
var body = $("body");
|
||||
|
||||
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-4"]) {
|
||||
voiceMode.enable();
|
||||
}
|
||||
|
||||
if(settingsCookie["bda-gs-5"]) {
|
||||
$("#app-mount").addClass("bda-dark");
|
||||
}
|
||||
|
||||
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).off("mouseover.etitles").on("mouseover.etitles", ".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).off("mouseleave.etitles").on("mouseleave.etitles", ".emote", function () {
|
||||
$(".tipsy").remove();
|
||||
});
|
||||
} else {
|
||||
$(document).off("mouseover.etitles");
|
||||
$(document).off("mouseleave.etitles");
|
||||
}
|
||||
};
|
||||
|
||||
SettingsPanel.prototype.changeTab = function(tab) {
|
||||
this.lastTab = tab;
|
||||
tab = $(tab).prop("id");
|
||||
$(".bd-tab").removeClass("selected");
|
||||
$(".bd-pane").hide();
|
||||
$("#" + tab).addClass("selected");
|
||||
$("#" + tab.replace("tab", "pane")).show();
|
||||
|
||||
switch(tab) {
|
||||
case "bd-customcss-tab":
|
||||
if(!this.customCssInitialized) {
|
||||
customCssEditor.init();
|
||||
this.customCssInitialized = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
};
|
||||
|
||||
SettingsPanel.prototype.updateSetting = function(checkbox) {
|
||||
console.log("Working?");
|
||||
};
|
||||
|
||||
SettingsPanel.prototype.constructPanel = function() {
|
||||
var self = this;
|
||||
self.lastTab = "";
|
||||
|
||||
panel = $("<div/>", {
|
||||
id: "bd-pane",
|
||||
class: "settings-inner",
|
||||
css: {
|
||||
"display": "none"
|
||||
}
|
||||
});
|
||||
|
||||
var panelHtml = '\
|
||||
<div class="scroller-wrap">\
|
||||
<div class="scroller settings-wrapper settings-panel">\
|
||||
<div class="tab-bar TOP">\
|
||||
<div class="tab-bar-item bd-tab selected" id="bd-settings-tab" onclick="settingsPanel.changeTab(this);">Core</div>\
|
||||
<div class="tab-bar-item bd-tab" id="bd-emotes-tab" onclick="settingsPanel.changeTab(this);">Emotes</div>\
|
||||
<div class="tab-bar-item bd-tab" id="bd-customcss-tab" onclick="settingsPanel.changeTab(this);">Custom CSS</div>\
|
||||
<div class="tab-bar-item bd-tab" id="bd-plugins-tab" onclick="settingsPanel.changeTab(this);">Plugins</div>\
|
||||
<div class="tab-bar-item bd-tab" id="bd-themes-tab" onclick="settingsPanel.changeTab(this);">Themes</div>\
|
||||
</div>\
|
||||
<div class="bd-settings">\
|
||||
<div class="bd-pane control-group" id="bd-settings-pane" style="">\
|
||||
<ul class="checkbox-group">\
|
||||
';
|
||||
|
||||
//Core settings
|
||||
for(var setting in bdConfig.options) {
|
||||
var sett = bdConfig.options[setting];
|
||||
var id = sett["id"];
|
||||
if(sett["cat"] != "core" || !sett["implemented"] || sett["hidden"]) continue;
|
||||
|
||||
panelHtml += '\
|
||||
<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>\
|
||||
';
|
||||
}
|
||||
|
||||
panelHtml += '\
|
||||
</ul>\
|
||||
</div>\
|
||||
<div class="bd-pane control-group" id="bd-emotes-pane" style="display:none;">\
|
||||
<ul class="checkbox-group">\
|
||||
';
|
||||
|
||||
//Emote settings
|
||||
for(var setting in bdConfig.options) {
|
||||
var sett = bdConfig.options[setting];
|
||||
var id = sett["id"];
|
||||
if(sett["cat"] != "emote" || !sett["implemented"] || sett["hidden"]) continue;
|
||||
|
||||
panelHtml += '\
|
||||
<li>\
|
||||
'+
|
||||
utils.getDiscordCheckbox({
|
||||
onClick: "settingsPanel.updateSetting(this)",
|
||||
id: id,
|
||||
checked: settingsCookie[id],
|
||||
text: setting + " - " + sett["info"]
|
||||
})
|
||||
+'\
|
||||
</li>\
|
||||
';
|
||||
}
|
||||
|
||||
var ccss = atob(localStorage.getItem("bdcustomcss"));
|
||||
customCssEditor.applyCustomCss(ccss, true, false);
|
||||
|
||||
panelHtml += '\
|
||||
</ul>\
|
||||
</div>\
|
||||
<div class="bd-pane control-group" id="bd-customcss-pane" style="display:none;">\
|
||||
<div id="editor-detached" style="display:none;">\
|
||||
<h3>Editor Detached</h3>\
|
||||
<button class="btn btn-primary" onclick="customCssEditor.attach(); return false;">Attach</button>\
|
||||
</div>\
|
||||
<div id="bd-customcss-innerpane">\
|
||||
<textarea id="bd-custom-css-ta">'+ccss+'</textarea>\
|
||||
</div>\
|
||||
</div>\
|
||||
<div class="bd-pane control-group" id="bd-plugins-pane" style="display:none;">\
|
||||
<ul class="bda-slist">\
|
||||
';
|
||||
|
||||
|
||||
//Plugins
|
||||
$.each(bdplugins, function() {
|
||||
var plugin = this["plugin"];
|
||||
panelHtml += '\
|
||||
<li>\
|
||||
<div class="bda-left">\
|
||||
<div class="bda-name">\
|
||||
'+plugin.getName() + ' v' + plugin.getVersion() + ' by ' + plugin.getAuthor() +'\
|
||||
</div>\
|
||||
<div class="bda-description">\
|
||||
'+plugin.getDescription()+'\
|
||||
</div>\
|
||||
</div>\
|
||||
<div class="bda-right">\
|
||||
<div class="checkbox">\
|
||||
<div class="checkbox-inner">\
|
||||
<input type="checkbox">\
|
||||
<span></span>\
|
||||
</div>\
|
||||
</div>\
|
||||
<button class="btn btn-primary">Settings</button>\
|
||||
</div>\
|
||||
</li>\
|
||||
';
|
||||
});
|
||||
|
||||
|
||||
panelHtml += '\
|
||||
</ul>\
|
||||
</div>\
|
||||
<div class="bd-pane control-group" id="bd-themes-pane" style="display:none;">\
|
||||
</div>\
|
||||
</div>\
|
||||
</div>\
|
||||
<div style="background:#2E3136; color:#ADADAD; height:30px; position:absolute; bottom:0; left:0; right:0;"> <span style="line-height:30px;margin-left:10px;">BetterDiscord v'+BdApi.getCore().version+'(JSv'+BdApi.getCore().jsVersion+') by Jiiks</span> <span style="float:right;line-height:30px;margin-right:10px;"><a href="http://betterdiscord.net" target="_blank">BetterDiscord.net</a></span> </div>\
|
||||
</div>\
|
||||
';
|
||||
|
||||
panel.html(panelHtml);
|
||||
|
||||
function showSettings() {
|
||||
$(".tab-bar-item").removeClass("selected");
|
||||
settingsButton.addClass("selected");
|
||||
$(".form .settings-right .settings-inner").first().hide();
|
||||
panel.show();
|
||||
if (self.lastTab == "") {
|
||||
self.changeTab({id:"bd-settings-tab"});
|
||||
} else {
|
||||
self.changeTab(self.lastTab);
|
||||
}
|
||||
}
|
||||
|
||||
settingsButton = $("<div/>", {
|
||||
class: "tab-bar-item",
|
||||
text: "BetterDiscord",
|
||||
id: "bd-settings-new",
|
||||
click: showSettings
|
||||
});
|
||||
|
||||
|
||||
(function defer() {
|
||||
if($(".btn.btn-settings").length < 1) {
|
||||
setTimeout(defer, 100);
|
||||
return;
|
||||
}
|
||||
|
||||
$(".btn.btn-settings").first().off("click.bda").on("click.bda", function() {
|
||||
(function defer() {
|
||||
if(!$(".modal-inner").first().is(":visible")) {
|
||||
setTimeout(defer, 100);
|
||||
return;
|
||||
}
|
||||
|
||||
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);
|
||||
$(".form .settings-right .settings-inner").last().after(panel);
|
||||
$("#bd-settings-new").removeClass("selected");
|
||||
|
||||
})();
|
||||
});
|
||||
})();
|
||||
};
|
||||
|
|
@ -64,4 +64,17 @@ Utils.prototype.log = function (message) {
|
|||
|
||||
Utils.prototype.err = function (message) {
|
||||
console.info("%c[BetterDiscord]%c " + message, "color:red; font-weight:bold;", "");
|
||||
};
|
||||
|
||||
//Html generation utils
|
||||
Utils.prototype.getDiscordCheckbox = function(data) {
|
||||
return '\
|
||||
<div class="checkbox" onclick="'+data.onClick+'">\
|
||||
<div class="checkbox-inner">\
|
||||
<input type="checkbox" id="'+data.id+'" '+(data.checked ? "checked" : "")+'>\
|
||||
<span></span>\
|
||||
</div>\
|
||||
<span>'+data.text+'</span>\
|
||||
</div>\
|
||||
';
|
||||
};
|
||||
Loading…
Reference in New Issue