This commit is contained in:
Jiiks 2015-12-23 10:56:16 +02:00
parent b9e32b80e0
commit 806979ee41
2 changed files with 68 additions and 6 deletions

File diff suppressed because one or more lines are too long

View File

@ -9,7 +9,7 @@
var settingsPanel, emoteModule, utils, quickEmoteMenu, opublicServers, voiceMode, pluginModule, themeModule; var settingsPanel, emoteModule, utils, quickEmoteMenu, opublicServers, voiceMode, pluginModule, themeModule;
var jsVersion = 1.55; var jsVersion = 1.55;
var supportedVersion = "0.2.3"; var supportedVersion = "0.2.0";
var mainObserver; var mainObserver;
@ -48,11 +48,11 @@ var defaultCookie = {
"version": jsVersion, "version": jsVersion,
"bda-gs-0": false, "bda-gs-0": false,
"bda-gs-1": true, "bda-gs-1": true,
"bda-gs-2": false, "bda-gs-2": true,
"bda-gs-3": false, "bda-gs-3": false,
"bda-gs-4": false, "bda-gs-4": false,
"bda-es-0": true, "bda-es-0": true,
"bda-es-1": false, "bda-es-1": true,
"bda-es-2": false, "bda-es-2": false,
"bda-es-3": false, "bda-es-3": false,
"bda-es-4": false, "bda-es-4": false,
@ -113,7 +113,7 @@ var bdchangelog = {
}, },
"femotes": { "femotes": {
"title": "Favorite Emotes!", "title": "Favorite Emotes!",
"test": "Favorite emotes right click now always works!", "text": "Favorite emotes right click now always works!",
"img": "" "img": ""
}, },
"pservers": { "pservers": {
@ -145,6 +145,7 @@ Core.prototype.init = function() {
var self = this; var self = this;
if(version < supportedVersion) { if(version < supportedVersion) {
$("body").append("<div></div>");
alert("BetterDiscord v" + version + "(your version)" + " is not supported by the latest js("+jsVersion+"). Please download the latest version from betterdiscord.net"); alert("BetterDiscord v" + version + "(your version)" + " is not supported by the latest js("+jsVersion+"). Please download the latest version from betterdiscord.net");
return; return;
} }
@ -361,6 +362,21 @@ Core.prototype.constructChangelog = function() {
return changeLog; 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">×</div>' +
' </div>' +
' <div class="bd-alert-body">' +
' <div class="scroller-wrap dark fade">' +
' <div class="scroller">'+text+'</div>' +
' </div>' +
' </div>' +
'</div>');
};
/* BetterDiscordApp EmoteModule JavaScript /* BetterDiscordApp EmoteModule JavaScript
* Version: 1.5 * Version: 1.5
* Author: Jiiks | http://jiiks.net * Author: Jiiks | http://jiiks.net
@ -561,7 +577,7 @@ EmoteModule.prototype.autoCapitalize = function() {
var lastWord = text.split(" ").pop(); var lastWord = text.split(" ").pop();
if(lastWord.length > 3) { if(lastWord.length > 3) {
var ret = self.capitalize(lastWord.toLowerCase()); var ret = self.capitalize(lastWord.toLowerCase());
if(ret != null) { if(ret !== null && ret !== undefined) {
$(".channel-textarea-inner textarea").val(text.replace(lastWord, ret)); $(".channel-textarea-inner textarea").val(text.replace(lastWord, ret));
} }
} }
@ -929,7 +945,6 @@ QuickEmoteMenu.prototype.updateFavorites = function() {
ta.val(ta.val().slice(-1) == " " ? ta.val() + emote : ta.val() + " " + emote); ta.val(ta.val().slice(-1) == " " ? ta.val() + emote : ta.val() + " " + emote);
}); });
icon.off("contextmenu").on("contextmenu", function(e) { icon.off("contextmenu").on("contextmenu", function(e) {
console.log("IT'S HAPPENING!");
var title = $(this).attr("title"); var title = $(this).attr("title");
var menu = $("#rmenu"); var menu = $("#rmenu");
menu.find("a").off("click").on("click",function() { menu.find("a").off("click").on("click",function() {