diff --git a/devjs/core.js b/devjs/core.js index 49a0fba6..090ba209 100644 --- a/devjs/core.js +++ b/devjs/core.js @@ -57,6 +57,7 @@ var defaultCookie = { }; var settingsCookie = {}; +var version = "0"; function Core() {} @@ -79,13 +80,14 @@ Core.prototype.init = function() { this.initSettings(); this.initObserver(); - //Incase were too fast + //In case were too fast function gwDefer() { if($(".guilds-wrapper").size() > 0) { + var guilds = $(".guilds li:first-child"); - $(".guilds li:first-child").after($("
  • ", { id: "bd-pub-li", css: { "height": "20px", "display": settingsCookie["bda-gs-1"] == true ? "" : "none" } }).append($("
    ", { class: "guild-inner", css: { "height": "20px" } }).append($("").append($("
    ", { css: { "line-height": "20px" }, text: "public", id: "bd-pub-button" }))))); - $(".guilds li:first-child").after($("
  • ", {id:"tc-settings-li"}).append($("
    ", { class: "guild-inner" }).append($("").append($("
    ", { class: "avatar-small", id: "tc-settings-button" }))))); + guilds.after($("
  • ", { id: "bd-pub-li", css: { "height": "20px", "display": settingsCookie["bda-gs-1"] == true ? "" : "none" } }).append($("
    ", { class: "guild-inner", css: { "height": "20px" } }).append($("").append($("
    ", { css: { "line-height": "20px" }, text: "public", id: "bd-pub-button" }))))); + guilds.after($("
  • ", {id:"tc-settings-li"}).append($("
    ", { class: "guild-inner" }).append($("").append($("
    ", { class: "avatar-small", id: "tc-settings-button" }))))); settingsPanel = new SettingsPanel(); settingsPanel.init(); diff --git a/devjs/main.js b/devjs/main.js index cbdc03b9..9b12f3af 100644 --- a/devjs/main.js +++ b/devjs/main.js @@ -84,8 +84,10 @@ Core.prototype.init = function() { if($(".guilds-wrapper").size() > 0) { - $(".guilds li:first-child").after($("
  • ", { id: "bd-pub-li", css: { "height": "20px", "display": settingsCookie["bda-gs-1"] == true ? "" : "none" } }).append($("
    ", { class: "guild-inner", css: { "height": "20px" } }).append($("").append($("
    ", { css: { "line-height": "20px" }, text: "public", id: "bd-pub-button" }))))); - $(".guilds li:first-child").after($("
  • ", {id:"tc-settings-li"}).append($("
    ", { class: "guild-inner" }).append($("").append($("
    ", { class: "avatar-small", id: "tc-settings-button" }))))); + var guilds = $(".guilds li:first-child"); + + guilds.after($("
  • ", { id: "bd-pub-li", css: { "height": "20px", "display": settingsCookie["bda-gs-1"] == true ? "" : "none" } }).append($("
    ", { class: "guild-inner", css: { "height": "20px" } }).append($("").append($("
    ", { css: { "line-height": "20px" }, text: "public", id: "bd-pub-button" }))))); + guilds.after($("
  • ", {id:"tc-settings-li"}).append($("
    ", { class: "guild-inner" }).append($("").append($("
    ", { class: "avatar-small", id: "tc-settings-button" }))))); settingsPanel = new SettingsPanel(); settingsPanel.init(); @@ -104,7 +106,7 @@ Core.prototype.init = function() { } gwDefer(); -} +}; Core.prototype.initSettings = function() { if($.cookie("better-discord") == undefined) { @@ -120,15 +122,15 @@ Core.prototype.initSettings = function() { } } } -} +}; 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() { @@ -145,7 +147,7 @@ Core.prototype.initObserver = function() { }); mainObserver.observe(document, { childList: true, subtree: true }); -} +}; /* BetterDiscordApp EmoteModule JavaScript * Version: 1.5 @@ -169,13 +171,12 @@ var emotesFfz = {}; var emotesBTTV = {}; var emotesTwitch = {}; var subEmotesTwitch = {}; -//var emotesTwitch = {":(":2, ":)": 1, ":/":10, ":D":3, ":o":8, ":p":12, ":z":5, ";)":11, ";p":13, "<3":9, ">(":4, "B)":7, "o_o":6, "R)":14,"4Head":354,"ANELE":3792,"ArgieB8":51838,"ArsonNoSexy":50,"AsianGlow":74,"AtGL":9809,"AthenaPMS":32035,"AtIvy":9800,"AtWW":9801,"BabyRage":22639,"BatChest":1905,"BCWarrior":30,"BibleThump":86,"BigBrother":1904,"BionicBunion":24,"BlargNaut":38,"BloodTrail":69,"BORT":243,"BrainSlug":881,"BrokeBack":4057,"BuddhaBar":27602,"CoolCat":58127,"CorgiDerp":49106,"CougarHunt":21,"DAESuppy":973,"DansGame":33,"DatHass":20225,"DatSheffy":170,"DBstyle":73,"deExcite":46249,"deIlluminati":46248,"DendiFace":58135,"DogFace":1903,"DOOMGuy":54089,"EagleEye":20,"EleGiggle":4339,"EvilFetus":72,"FailFish":360,"FPSMarksman":42,"FrankerZ":65,"FreakinStinkin":39,"FUNgineer":244,"FunRun":48,"FuzzyOtterOO":168,"GasJoker":9802,"GingerPower":32,"GrammarKing":3632,"HassanChop":68,"HeyGuys":30259,"HotPokket":357,"HumbleLife":46881,"ItsBoshyTime":169,"Jebaited":90,"JKanStyle":15,"JonCarnage":26,"KAPOW":9803,"Kappa":25,"KappaPride":55338,"Keepo":1902,"KevinTurtle":40,"Kippa":1901,"Kreygasm":41,"KZskull":5253,"Mau5":30134,"mcaT":35063,"MechaSupes":9804,"MrDestructoid":28,"MVGame":29,"NightBat":9805,"NinjaTroll":45,"NoNoSpot":44,"NotATK":34875,"NotLikeThis":58765,"OMGScoots":91,"OneHand":66,"OpieOP":356,"OptimizePrime":16,"OSbeaver":47005,"OSbury":47420,"OSdeo":47007,"OSfrog":47008,"OSkomodo":47010,"OSrob":47302,"OSsloth":47011,"panicBasket":22998,"PanicVis":3668,"PazPazowitz":19,"PeoplesChamp":3412,"PermaSmug":27509,"PicoMause":27,"PipeHype":4240,"PJHarley":9808,"PJSalt":36,"PMSTwin":92,"PogChamp":88,"Poooound":358,"PraiseIt":38586,"PRChase":28328,"PunchTrees":47,"PuppeyFace":58136,"RaccAttack":27679,"RalpherZ":1900,"RedCoat":22,"ResidentSleeper":245,"RitzMitz":4338,"RuleFive":361,"ShadyLulu":52492,"Shazam":9807,"shazamicon":9806,"ShazBotstix":87,"ShibeZ":27903,"SMOrc":52,"SMSkull":51,"SoBayed":1906,"SoonerLater":355,"SriHead":14706,"SSSsss":46,"StoneLightning":17,"StrawBeary":37,"SuperVinlin":31,"SwiftRage":34,"tbBaconBiscuit":44499,"tbChickenBiscuit":56879,"tbQuesarito":56883,"tbSausageBiscuit":56881,"tbSpicy":56882,"tbSriracha":56880,"TF2John":1899,"TheKing":50901,"TheRinger":18,"TheTarFu":70,"TheThing":7427,"ThunBeast":1898,"TinyFace":67,"TooSpicy":359,"TriHard":171,"TTours":38436,"UleetBackup":49,"UncleNox":3666,"UnSane":71,"VaultBoy":54090,"Volcania":166,"WholeWheat":1896,"WinWaker":167,"WTRuck":1897,"WutFace":28087,"YouWHY":4337}; 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() {} -EmoteModule.prototype.init = function() {} +EmoteModule.prototype.init = function() {}; EmoteModule.prototype.obsCallback = function(mutation) { var self = this; @@ -184,11 +185,13 @@ EmoteModule.prototype.obsCallback = function(mutation) { if(next) { var nodes = self.getNodes(next); for(var node in nodes) { - self.injectEmote(nodes[node]); + if(nodes.hasOwnProperty(node)) { + self.injectEmote(nodes[node]); + } } } } -} +}; EmoteModule.prototype.getNodes = function(node) { var next; @@ -201,7 +204,7 @@ EmoteModule.prototype.getNodes = function(node) { } return nodes; -} +}; EmoteModule.prototype.injectEmote = function(node) { @@ -253,15 +256,16 @@ EmoteModule.prototype.injectEmote = function(node) { //Scrollfix var scrollPane = $($(".scroller.messages")[0]) scrollPane.scrollTop(scrollPane.scrollTop() + (newHeight - oldHeight)); -} +}; EmoteModule.prototype.autoCapitalize = function() { var self = this; + var textArea = $(".channel-textarea-inner textarea"); - $('body').delegate($(".channel-textarea-inner textarea"), 'keyup change paste', function() { + $('body').delegate(textArea, 'keyup change paste', function() { if(!settingsCookie["bda-es-4"]) return; - var text = $(".channel-textarea-inner textarea").val(); + var text = textArea.val(); if(text == undefined) return; @@ -269,20 +273,18 @@ EmoteModule.prototype.autoCapitalize = function() { if(lastWord.length > 3) { var ret = self.capitalize(lastWord.toLowerCase()); if(ret != null) { - $(".channel-textarea-inner textarea").val(text.replace(lastWord, ret)); + textArea.val(text.replace(lastWord, ret)); } } - }); - -} +}; EmoteModule.prototype.capitalize = function(value) { if(twitchAc.hasOwnProperty(value)) { return twitchAc[value]; } return null; -} +}; /* BetterDiscordApp PublicSevers JavaScripts @@ -300,7 +302,7 @@ function PublicServers() { PublicServers.prototype.getPanel = function() { return this.container; -} +}; PublicServers.prototype.init = function() { @@ -376,7 +378,7 @@ PublicServers.prototype.init = function() { this.addServer(name, code, title, language, description); } -} +}; PublicServers.prototype.addServer = function(name, code, title, language, description) { @@ -409,11 +411,11 @@ PublicServers.prototype.addServer = function(name, code, title, language, descri tr.append(desc); tableBody.append(tr); -} +}; PublicServers.prototype.show = function() { this.getPanel().toggle(); -} +}; /* BetterDiscordApp QuickEmoteMenu JavaScript @@ -426,9 +428,6 @@ PublicServers.prototype.show = function() { var emoteBtn, emoteMenu; -//var globalEmotes = {":(":2, ":)": 1, ":/":10, ":D":3, ":o":8, ":p":12, ":z":5, ";)":11, ";p":13, "<3":9, ">(":4, "B)":7, "o_o":6, "R)":14,"4Head":354,"ANELE":3792,"ArgieB8":51838,"ArsonNoSexy":50,"AsianGlow":74,"AtGL":9809,"AthenaPMS":32035,"AtIvy":9800,"AtWW":9801,"BabyRage":22639,"BatChest":1905,"BCWarrior":30,"BibleThump":86,"BigBrother":1904,"BionicBunion":24,"BlargNaut":38,"BloodTrail":69,"BORT":243,"BrainSlug":881,"BrokeBack":4057,"BuddhaBar":27602,"CoolCat":58127,"CorgiDerp":49106,"CougarHunt":21,"DAESuppy":973,"DansGame":33,"DatHass":20225,"DatSheffy":170,"DBstyle":73,"deExcite":46249,"deIlluminati":46248,"DendiFace":58135,"DogFace":1903,"DOOMGuy":54089,"EagleEye":20,"EleGiggle":4339,"EvilFetus":72,"FailFish":360,"FPSMarksman":42,"FrankerZ":65,"FreakinStinkin":39,"FUNgineer":244,"FunRun":48,"FuzzyOtterOO":168,"GasJoker":9802,"GingerPower":32,"GrammarKing":3632,"HassanChop":68,"HeyGuys":30259,"HotPokket":357,"HumbleLife":46881,"ItsBoshyTime":169,"Jebaited":90,"JKanStyle":15,"JonCarnage":26,"KAPOW":9803,"Kappa":25,"KappaPride":55338,"Keepo":1902,"KevinTurtle":40,"Kippa":1901,"Kreygasm":41,"KZskull":5253,"Mau5":30134,"mcaT":35063,"MechaSupes":9804,"MrDestructoid":28,"MVGame":29,"NightBat":9805,"NinjaTroll":45,"NoNoSpot":44,"NotATK":34875,"NotLikeThis":58765,"OMGScoots":91,"OneHand":66,"OpieOP":356,"OptimizePrime":16,"OSbeaver":47005,"OSbury":47420,"OSdeo":47007,"OSfrog":47008,"OSkomodo":47010,"OSrob":47302,"OSsloth":47011,"panicBasket":22998,"PanicVis":3668,"PazPazowitz":19,"PeoplesChamp":3412,"PermaSmug":27509,"PicoMause":27,"PipeHype":4240,"PJHarley":9808,"PJSalt":36,"PMSTwin":92,"PogChamp":88,"Poooound":358,"PraiseIt":38586,"PRChase":28328,"PunchTrees":47,"PuppeyFace":58136,"RaccAttack":27679,"RalpherZ":1900,"RedCoat":22,"ResidentSleeper":245,"RitzMitz":4338,"RuleFive":361,"ShadyLulu":52492,"Shazam":9807,"shazamicon":9806,"ShazBotstix":87,"ShibeZ":27903,"SMOrc":52,"SMSkull":51,"SoBayed":1906,"SoonerLater":355,"SriHead":14706,"SSSsss":46,"StoneLightning":17,"StrawBeary":37,"SuperVinlin":31,"SwiftRage":34,"tbBaconBiscuit":44499,"tbChickenBiscuit":56879,"tbQuesarito":56883,"tbSausageBiscuit":56881,"tbSpicy":56882,"tbSriracha":56880,"TF2John":1899,"TheKing":50901,"TheRinger":18,"TheTarFu":70,"TheThing":7427,"ThunBeast":1898,"TinyFace":67,"TooSpicy":359,"TriHard":171,"TTours":38436,"UleetBackup":49,"UncleNox":3666,"UnSane":71,"VaultBoy":54090,"Volcania":166,"WholeWheat":1896,"WinWaker":167,"WTRuck":1897,"WutFace":28087,"YouWHY":4337}; -var emoteList; - function QuickEmoteMenu() { } @@ -466,26 +465,27 @@ QuickEmoteMenu.prototype.init = function (reload) { emoteBtn.show(); } - $(".emote-icon").off(); - $(".emote-icon").on("click", function() { + var emoteIcon = $(".emote-icon"); + + emoteIcon.off(); + emoteIcon.on("click", function() { var emote = $(this).attr("id"); var ta = $(".channel-textarea-inner textarea"); ta.val(ta.val().slice(-1) == " " ? ta.val() + emote : ta.val() + " " + emote); }); -} +}; QuickEmoteMenu.prototype.obsCallback = function() { if(!emoteBtn) return; if(!$(".content.flex-spacer.flex-horizontal .flex-spacer.flex-vertical form")) return; - tcbtn = $("#twitchcord-button-container"); + var tcbtn = $("#twitchcord-button-container"); if(tcbtn.parent().prop("tagName") == undefined) { quickEmoteMenu = new QuickEmoteMenu(); quickEmoteMenu.init(true); } - -} +}; QuickEmoteMenu.prototype.initEmoteList = function() { @@ -497,12 +497,10 @@ QuickEmoteMenu.prototype.initEmoteList = function() { emoteMenu.append(emoteMenuBody); for(var emote in emotesTwitch.emotes) { - var command = emote; var id = emotesTwitch.emotes[emote].image_id; - emoteMenuBody.append($("
    " , { class: "emote-container" }).append($("", { class: "emote-icon", id: emote, alt: "", src: "https://static-cdn.jtvnw.net/emoticons/v1/"+id+"/1.0", title: emote }))); } -} +}; /* BetterDiscordApp Settings Panel JavaScript * Version: 1.3 @@ -520,11 +518,12 @@ function SettingsPanel() { SettingsPanel.prototype.getPanel = function() { return this.tcSettingsPanel; -} +}; SettingsPanel.prototype.init = function() { var self = this; + var body = $("body"); this.tcSettingsPanel = $("
    ", { id: "tc-settings-panel", style: "display:none" }); this.getPanel().append($("
    ", { id: "tc-settings-panel-header" }).append($("

    ", { text: "BetterDiscord - Settings" })).append($("", { id: "tc-settings-close", text: "X", style:"cursor:pointer;" }))); @@ -542,7 +541,7 @@ SettingsPanel.prototype.init = function() { } settingsList.append($("
  • ").append($("

    ", { text: key})).append($("", { html: " - " + value.info + "" + (value.implemented == false ? ' Coming Soon' : "") })).append($("
    ", { class: value.implemented ? "tc-switch" : "tc-switch disabled", id: value.id }).append($("", { class: sof, text: "OFF" })).append($("", { class: son, text: "ON" })))); - }) + }); var settingsFooter = $("
    ", { id: "tc-settings-panel-footer" }); settingsFooter.append($("", { id: "tc-about", text: "BDA v" + version + "(js "+jsVersion+") by Jiiks | Settings are automatically saved." } )); @@ -550,12 +549,12 @@ SettingsPanel.prototype.init = function() { $.each(links, function(key, value) { tcLinks.append($("", { href: value, text: key, target: "_blank" })); tcLinks.append($("", { text: " | " })); - }) + }); settingsFooter.append(tcLinks); this.getPanel().append(settingsFooter); - $("body").append(this.getPanel()); + body.append(this.getPanel()); $("#tc-settings-close").on("click", function(e) { self.show(); }); $(".tc-switch").on("click", function() { self.handler($(this)) }); @@ -566,29 +565,31 @@ SettingsPanel.prototype.init = function() { } if(settingsCookie["bda-gs-2"]) { - $("body").addClass("bd-minimal"); + body.addClass("bd-minimal"); } else { - $("body").removeClass("bd-minimal"); + body.removeClass("bd-minimal"); } if(settingsCookie["bda-gs-3"]) { - $("body").addClass("bd-minimal-chan"); + body.addClass("bd-minimal-chan"); } else { - $("body").removeClass("bd-minimal-chan"); + body.removeClass("bd-minimal-chan"); } if(settingsCookie["bda-gs-4"]) { voiceMode.enable(); } -} +}; SettingsPanel.prototype.show = function() { this.getPanel().toggle(); - $("#tc-settings-li").removeClass(); + var settingsLi = $("#tc-settings-li"); + + settingsLi.removeClass(); if(this.getPanel().is(":visible")) { - $("#tc-settings-li").addClass("active"); + settingsLi.addClass("active"); } -} +}; SettingsPanel.prototype.handler = function(e){ @@ -637,7 +638,7 @@ SettingsPanel.prototype.handler = function(e){ } mainCore.saveSettings(); -} +}; /* BetterDiscordApp VoiceMode JavaScript * Version: 1.0 @@ -669,7 +670,7 @@ VoiceMode.prototype.disable = function() { $($(".chat.flex-vertical.flex-spacer")[0]).css("min-width", ""); $($(".flex-vertical.channels-wrap")[0]).css("width", ""); $($(".guild-header .btn.btn-hamburger")[0]).css("visibility", ""); -} +}; /* BetterDiscordApp Utilities JavaScript * Version: 1.0 @@ -684,8 +685,8 @@ function Utils() { Utils.prototype.getTextArea = function() { return $(".channel-textarea-inner textarea"); -} +}; Utils.prototype.jqDefer = function(fnc) { if(window.jQuery) { fnc(); } else { setTimeout(function() { this.jqDefer(fnc) }, 100) } -} +}; \ No newline at end of file