diff --git a/js/main.js b/js/main.js index 67e4082a..c1b2ed3f 100644 --- a/js/main.js +++ b/js/main.js @@ -1255,7 +1255,7 @@ SettingsPanel.prototype.construct = function() { }); tabBar.append(settingsButton); - panel.insertAfter(".form .settings-right .settings-inner"); + $(".form .settings-right .settings-inner").last().after(panel); $("#bd-settings-new").removeClass("selected"); } else { setTimeout(innerDefer, 100); diff --git a/js/main.min.js b/js/main.min.js index 30501fa1..6db35a67 100644 --- a/js/main.min.js +++ b/js/main.min.js @@ -1,3 +1,3 @@ function Core(){}function EmoteModule(){}function PublicServers(){}function QuickEmoteMenu(){}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")}function Utils(){}function VoiceMode(){}function PluginModule(){}function ThemeModule(){}function BdApi(){}var settingsPanel,emoteModule,utils,quickEmoteMenu,opublicServers,voiceMode,pluginModule,themeModule,jsVersion=1.54,supportedVersion="0.2.3",mainObserver,twitchEmoteUrlStart="https://static-cdn.jtvnw.net/emoticons/v1/",twitchEmoteUrlEnd="/1.0",ffzEmoteUrlStart="https://cdn.frankerfacez.com/emoticon/",ffzEmoteUrlEnd="/1",bttvEmoteUrlStart="https://cdn.betterttv.net/emote/",bttvEmoteUrlEnd="/1x",mainCore,settings={"Save logs locally":{id:"bda-gs-0",info:"Saves chat logs locally",implemented:!1},"Public Servers":{id:"bda-gs-1",info:"Display public servers button",implemented:!0},"Minimal Mode":{id:"bda-gs-2",info:"Hide elements and reduce the size of elements.",implemented:!0},"Voice Mode":{id:"bda-gs-4",info:"Only show voice chat",implemented:!0},"Hide Channels":{id:"bda-gs-3",info:"Hide channels in minimal mode",implemented:!0},"Quick Emote Menu":{id:"bda-es-0",info:"Show quick emote menu for adding emotes",implemented:!0},"Show Emotes":{id:"bda-es-7",info:"Show any emotes",implemented:!0},"FrankerFaceZ Emotes":{id:"bda-es-1",info:"Show FrankerFaceZ Emotes",implemented:!0},"BetterTTV Emotes":{id:"bda-es-2",info:"Show BetterTTV Emotes",implemented:!0},"Emote Autocomplete":{id:"bda-es-3",info:"Autocomplete emote commands",implemented:!1},"Emote Auto Capitalization":{id:"bda-es-4",info:"Autocapitalize emote commands",implemented:!0},"Override Default Emotes":{id:"bda-es-5",info:"Override default emotes",implemented:!1},"Show Names":{id:"bda-es-6",info:"Show emote names on hover",implemented:!0}},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"}},defaultCookie={version:jsVersion,"bda-gs-0":!1,"bda-gs-1":!0,"bda-gs-2":!1,"bda-gs-3":!1,"bda-gs-4":!1,"bda-es-0":!0,"bda-es-1":!1,"bda-es-2":!1,"bda-es-3":!1,"bda-es-4":!1,"bda-es-5":!0,"bda-es-6":!0,"bda-es-7":!0,"bda-jd":!0},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 CodeMirror!",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:""}}},settingsCookie={};Core.prototype.init=function(){function A(){if(console.log((new Date).getTime()+" Defer"),$(".guilds-wrapper .guilds").children().length>0){console.log((new Date).getTime()+" Defer Loaded");var t=$(".guilds li:first-child");t.after($("
  • ",{id:"bd-pub-li",css:{height:"20px",display:1==settingsCookie["bda-gs-1"]?"":"none"}}).append($("
    ",{"class":"guild-inner",css:{height:"20px","border-radius":"4px"}}).append($("").append($("
    ",{css:{"line-height":"20px","font-size":"12px"},text:"public",id:"bd-pub-button"})))));var i=$("
    ';if(null!=bdchangelog.changes){A+='

    New Stuff

      ';for(var e in bdchangelog.changes)e=bdchangelog.changes[e],A+="
    • "+e.title+"
      "+e.text+"
      • ";A+="
    "}if(null!=bdchangelog.fixes){A+='

    Fixed

      ';for(var t in bdchangelog.fixes)t=bdchangelog.fixes[t],A+="
    • "+t.title+"
      "+t.text+"
      • ";A+="
    "}if(null!=bdchangelog.upcoming){A+='

    Coming Soon

      ';for(var i in bdchangelog.upcoming)i=bdchangelog.upcoming[i],A+="
    • "+i.title+"
      "+i.text+"
      • ";A+="
    "}return A+='
    '};var emotesFfz={},emotesBTTV={},emotesTwitch={emotes:{emote:{image_id:0}}},subEmotesTwitch={};EmoteModule.prototype.init=function(){},EmoteModule.prototype.getBlacklist=function(){$.getJSON("https://cdn.rawgit.com/Jiiks/betterDiscordApp/"+_hash+"/emotefilter.json",function(A){bemotes=A.blacklist})},EmoteModule.prototype.obsCallback=function(A){var e=this;if(settingsCookie["bda-es-7"])for(var t=0;t-1)return;return i.addClass("spoiler"),void i.on("click",function(){$(this).removeClass("spoiler"),spoilered.push($(this).attr("data-reactid"))})}if(!(e.length<4)&&-1==$.inArray(e,bemotes)){if(emotesTwitch.emotes.hasOwnProperty(e)){var s=Math.round(e.length/4);return void(A=A.replace(e,''+e.substr(0,s)+'))}if("undefined"!=typeof emotesFfz&&settingsCookie["bda-es-1"]&&emotesFfz.hasOwnProperty(e)){var s=Math.round(e.length/4),g=e.substr(0,s)+"﷙"+e.substr(s,s)+"﷙"+e.substr(2*s,s)+"﷙"+e.substr(3*s),n=ffzEmoteUrlStart+emotesFfz[e]+ffzEmoteUrlEnd;return void(A=A.replace(e,'
    '+g+'
    '))}if("undefined"!=typeof emotesBTTV&&settingsCookie["bda-es-2"]&&emotesBTTV.hasOwnProperty(e)){var s=Math.round(e.length/4),g=e.substr(0,s)+"﷙"+e.substr(s,s)+"﷙"+e.substr(2*s,s)+"﷙"+e.substr(3*s),n=emotesBTTV[e];return void(A=A.replace(e,'
    '+g+'
    '))}if("undefined"!=typeof emotesBTTV2&&settingsCookie["bda-es-2"]&&emotesBTTV2.hasOwnProperty(e)){var s=Math.round(e.length/4),g=e.substr(0,s)+"﷙"+e.substr(s,s)+"﷙"+e.substr(2*s,s)+"﷙"+e.substr(3*s),n=bttvEmoteUrlStart+emotesBTTV2[e]+bttvEmoteUrlEnd;return void(A=A.replace(e,'
    '+g+'
    '))}if(subEmotesTwitch.hasOwnProperty(e)){var s=Math.round(e.length/4),g=e.substr(0,s)+"﷙"+e.substr(s,s)+"﷙"+e.substr(2*s,s)+"﷙"+e.substr(3*s),n=twitchEmoteUrlStart+subEmotesTwitch[e]+twitchEmoteUrlEnd;return void(A=A.replace(e,'
    '+g+'
    '))}}}),null!=t.parentElement)){var i=t.parentElement.offsetHeight;t.innerHTML=A.replace(new RegExp("﷙","g"),"");var o=t.parentElement.offsetHeight,s=$(".scroller.messages").first();s.scrollTop(s.scrollTop()+(o-i))}}}if("undefined"!=typeof emotesTwitch&&A.parentElement){var t=A.parentElement;if("SPAN"==t.tagName){var i=!1;$(t.parentElement).hasClass("edited")&&(t=t.parentElement.parentElement.firstChild,i=!0),i?setTimeout(e,250):e()}}},EmoteModule.prototype.autoCapitalize=function(){var A=this;$("body").delegate($(".channel-textarea-inner textarea"),"keyup change paste",function(){if(settingsCookie["bda-es-4"]){var e=$(".channel-textarea-inner textarea").val();if(void 0!=e){var t=e.split(" ").pop();if(t.length>3){var i=A.capitalize(t.toLowerCase());null!=i&&$(".channel-textarea-inner textarea").val(e.replace(t,i))}}}})},EmoteModule.prototype.capitalize=function(A){var e=emotesTwitch.emotes;for(var t in e)if(e.hasOwnProperty(t)&&A==(t+"").toLowerCase())return t};var publicServers={servers:{server:{code:0,icon:null,title:"title",language:"EN",description:"description"}}};PublicServers.prototype.getPanel=function(){return this.container},PublicServers.prototype.init=function(){var A=this;this.container=$("
    ",{id:"bd-ps-container",style:"display:none"});var e=$("
    ",{id:"bd-ps-header"});$("

    ",{text:"Public Servers"}).appendTo(e),$("",{id:"bd-ps-close",style:"cursor:pointer;",text:"X"}).appendTo(e),e.appendTo(this.getPanel());var t=$("
    ",{id:"bd-ps-body"});t.appendTo(this.getPanel());var i=$("",{border:"0"}),o=$("");o.appendTo(i);var s=$("",{}).append($("",{id:"bd-ps-tbody"});g.appendTo(i),i.appendTo(t),$("body").append(this.getPanel()),$("#bd-ps-close").on("click",function(){A.show()});var n=publicServers.servers;for(var B in n)if(n.hasOwnProperty(B)){var a=n[B],Q=a.code,r=a.title,E=a.language,w=a.description;this.addServer(B,Q,r,E,w)}},PublicServers.prototype.addServer=function(A,e,t,i,o){var s=this,g=$("#bd-ps-tbody"),n=$("");B.append($("
    ",{text:"Name"})).append($("",{text:"Code"})).append($("",{text:"Language"})).append($("",{text:"Description"})).append($("",{text:"Join"}));s.appendTo(o);var g=$("
    ").append($("
    ",{"class":"bd-ps-description",text:o})),B=$("
    ",{text:t})),B.append($("",{css:{"-webkit-user-select":"initial","user-select":"initial"},text:e})),B.append($("",{text:i})),B.append(n),B.append($("").append($("