' +
@@ -259,60 +294,60 @@ Core.prototype.constructChangelog = function() {
'
' +
'
';
- if(bdchangelog.changes != null) {
+ if (bdchangelog.changes != null) {
changeLog += '' +
'
' + ' New Stuff' + '
' + '- ';
- for(var change in bdchangelog.changes) {
+ for (var change in bdchangelog.changes) {
change = bdchangelog.changes[change];
changeLog += '' +
'
- ' +
- ' '+change.title+'' +
- ' '+change.text+'' + + ' ' + change.title + '' + + '' + change.text + '' + ' ';
}
changeLog += '
' + ' Fixed' + '
' + '- ';
- for(var fix in bdchangelog.fixes) {
+ for (var fix in bdchangelog.fixes) {
fix = bdchangelog.fixes[fix];
changeLog += '' +
'
- ' +
- ' '+fix.title+'' +
- ' '+fix.text+'' + + ' ' + fix.title + '' + + '' + fix.text + '' + ' ';
}
changeLog += '
' + ' Coming Soon' + '
' + '- ';
- for(var upc in bdchangelog.upcoming) {
+ for (var upc in bdchangelog.upcoming) {
upc = bdchangelog.upcoming[upc];
changeLog += '' +
'
- ' +
- ' '+upc.title+'' +
- ' '+upc.text+'' + + ' ' + upc.title + '' + + '' + upc.text + '' + ' ';
}
@@ -331,19 +366,19 @@ Core.prototype.constructChangelog = function() {
return changeLog;
};
-Core.prototype.alert = function(title, text) {
+Core.prototype.alert = function (title, text) {
$("body").append('' +
- '
' +
- '
');
+ '' +
- ' '+title+'' +
- '
' +
- ' ×
' +
- ' ' +
- '
' +
- '' +
- '
' +
- ' '+text+'
' +
- ' ' +
+ '
');
};
/* BetterDiscordApp EmoteModule JavaScript
@@ -363,37 +398,43 @@ Core.prototype.alert = function(title, text) {
var emotesFfz = {};
var emotesBTTV = {};
-var emotesTwitch = { "emotes": { "emote": { "image_id": 0 } } }; //for ide
+var emotesTwitch = {
+ "emotes": {
+ "emote": {
+ "image_id": 0
+ }
+ }
+}; //for ide
var subEmotesTwitch = {};
-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.getBlacklist = function() {
- $.getJSON("https://cdn.rawgit.com/Jiiks/betterDiscordApp/"+_hash+"/emotefilter.json", function(data) { bemotes = data.blacklist; });
-};
-
-EmoteModule.prototype.obsCallback = function(mutation) {
+EmoteModule.prototype.obsCallback = function (mutation) {
var self = this;
- if(!settingsCookie["bda-es-7"]) return;
-
- $(".emoji").each(function() {
+ if (!settingsCookie["bda-es-7"]) return;
+
+ $(".emoji").each(function () {
var t = $(this);
- if(t.attr("src").indexOf(".png") != -1) {
+ if (t.attr("src").indexOf(".png") != -1) {
t.replaceWith("" + t.attr("alt") + "");
}
});
- for(var i = 0 ; i < mutation.addedNodes.length ; ++i) {
+ for (var i = 0; i < mutation.addedNodes.length; ++i) {
var next = mutation.addedNodes.item(i);
- if(next) {
+ if (next) {
var nodes = self.getNodes(next);
- for(var node in nodes) {
- if(nodes.hasOwnProperty(node)) {
+ for (var node in nodes) {
+ if (nodes.hasOwnProperty(node)) {
self.injectEmote(nodes[node]);
}
}
@@ -401,13 +442,13 @@ EmoteModule.prototype.obsCallback = function(mutation) {
}
};
-EmoteModule.prototype.getNodes = function(node) {
+EmoteModule.prototype.getNodes = function (node) {
var next;
var nodes = [];
var treeWalker = document.createTreeWalker(node, NodeFilter.SHOW_TEXT, null, false);
- while(next = treeWalker.nextNode()) {
+ while (next = treeWalker.nextNode()) {
nodes.push(next);
}
@@ -418,47 +459,49 @@ EmoteModule.prototype.getNodes = function(node) {
var bemotes = [];
var spoilered = [];
-EmoteModule.prototype.injectEmote = function(node) {
+EmoteModule.prototype.injectEmote = function (node) {
- if(typeof emotesTwitch === 'undefined') return;
+ if (typeof emotesTwitch === 'undefined') return;
- if(!node.parentElement) return;
+ if (!node.parentElement) return;
var parent = node.parentElement;
-
- if(parent.tagName != "SPAN") return;
-
+
+ if (parent.tagName != "SPAN") return;
+
var edited = false;
-
- if($(parent.parentElement).hasClass("edited")) {
+
+ if ($(parent.parentElement).hasClass("edited")) {
parent = parent.parentElement.parentElement.firstChild; //:D
edited = true;
}
-
+
//if(!$(parent.parentElement).hasClass("markup") && !$(parent.parentElement).hasClass("message-content")) return;
function inject() {
- if(!$(parent.parentElement).hasClass("markup") && !$(parent.parentElement).hasClass("message-content")) { return; }
+ if (!$(parent.parentElement).hasClass("markup") && !$(parent.parentElement).hasClass("message-content")) {
+ return;
+ }
var parentInnerHTML = parent.innerHTML;
-
+
var words = parentInnerHTML.split(/\s+/g);
- if(!words) return;
+ if (!words) return;
- words.some(function(word) {
- if(word.slice(0, 4) == "[!s]" ) {
+ 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) {
+
+ if (spoilered.indexOf(reactId) > -1) {
return;
}
markup.addClass("spoiler");
- markup.on("click", function() {
+ markup.on("click", function () {
$(this).removeClass("spoiler");
spoilered.push($(this).attr("data-reactid"));
});
@@ -466,22 +509,22 @@ EmoteModule.prototype.injectEmote = function(node) {
return;
}
- if(word.length < 4) {
+ if (word.length < 4) {
return;
}
- if(word == "ClauZ") {
- parentInnerHTML = parentInnerHTML.replace("ClauZ", '' +
+ ' ' + title + '' +
+ '
' +
+ ' ×
' +
+ ' ' +
+ '
' +
+ '' +
+ '
' +
+ ' ' + text + '
' +
+ ' 
');
- return;
- }
+ if (word == "ClauZ") {
+ parentInnerHTML = parentInnerHTML.replace("ClauZ", '');
+ return;
+ }
- if($.inArray(word, bemotes) != -1) return;
+ if ($.inArray(word, bemotes) != -1) return;
if (emotesTwitch.emotes.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 name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
var url = twitchEmoteUrlStart + emotesTwitch.emotes[word].image_id + twitchEmoteUrlEnd;
- parentInnerHTML = parentInnerHTML.replace(word, '");
- $(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()});
+ emoteNamePopup = $("
");
+ $(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');
+ $(document).off('mouseover', '.emote');
}
};
-SettingsPanel.prototype.applyCustomCss = function(css) {
- if($("#customcss").length == 0) {
+SettingsPanel.prototype.applyCustomCss = function (css) {
+ if ($("#customcss").length == 0) {
$("head").append('');
}
@@ -987,95 +1115,107 @@ SettingsPanel.prototype.applyCustomCss = function(css) {
var customCssInitialized = false;
var lastTab = "";
-SettingsPanel.prototype.changeTab = function(tab) {
-
+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).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;
- }
+ switch (tab) {
+ case "bd-settings-tab":
break;
- case "bd-plugins-tab":
-
+ 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-themes-tab":
- controlGroups.html("Coming soon");
+ case "bd-plugins-tab":
+
+ break;
+ case "bd-themes-tab":
+ controlGroups.html("Coming soon");
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);
+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);
- settingsCookie[id] = enabled;
+ settingsCookie[id] = enabled;
- if(settingsCookie["bda-es-0"]) {
- $("#twitchcord-button-container").show();
- } else {
- $("#twitchcord-button-container").hide();
- }
+ 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 = $("
");
- $(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');
- }
+ 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 = $("
");
+ $(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();
+ mainCore.saveSettings();
}
-SettingsPanel.prototype.construct = function() {
+SettingsPanel.prototype.construct = function () {
var self = this;
-
+
panel = $("", {
id: "bd-pane",
class: "settings-inner",
@@ -1083,128 +1223,128 @@ SettingsPanel.prototype.construct = function() {
"display": "none"
}
});
-
+
var settingsInner = '' +
- '
' +
- '
' +
- ' ' +
- '
' +
- '' +
- '