This commit is contained in:
Mirco Wittrien 2019-06-19 21:17:58 +02:00
parent a09f24a940
commit 13c21b09ea
2 changed files with 14 additions and 12 deletions

View File

@ -3,7 +3,7 @@
class EditUsers { class EditUsers {
getName () {return "EditUsers";} getName () {return "EditUsers";}
getVersion () {return "3.4.3";} getVersion () {return "3.4.4";}
getAuthor () {return "DevilBro";} getAuthor () {return "DevilBro";}
@ -59,7 +59,7 @@ class EditUsers {
${BDFDB.dotCNC.userpopoutheaderbottag + BDFDB.dotCN.userpopoutheaderbottagwithnickname} { ${BDFDB.dotCNC.userpopoutheaderbottag + BDFDB.dotCN.userpopoutheaderbottagwithnickname} {
bottom: 4px; bottom: 4px;
} }
${BDFDB.dotCNS.userpopoutheadertagwithnickname + BDFDB.dotCN.userpopoutheaderbottagwithnickname} { ${BDFDB.dotCNS.userpopoutheadertagnonickname + BDFDB.dotCNC.userpopoutheaderbottag + BDFDB.dotCNS.userpopoutheadertagwithnickname + BDFDB.dotCN.userpopoutheaderbottagwithnickname} {
bottom: 0px; bottom: 0px;
} }
${BDFDB.dotCN.userprofilebottag} { ${BDFDB.dotCN.userprofilebottag} {
@ -1076,7 +1076,7 @@ class EditUsers {
else if (BDFDB.getParentEle(BDFDB.dotCN.textareawrapchat, wrapper)) key = "changeInChatTextarea"; else if (BDFDB.getParentEle(BDFDB.dotCN.textareawrapchat, wrapper)) key = "changeInChatTextarea";
else if (BDFDB.getParentEle(BDFDB.dotCN.voiceuser, wrapper)) key = "changeInVoiceChat"; else if (BDFDB.getParentEle(BDFDB.dotCN.voiceuser, wrapper)) key = "changeInVoiceChat";
else if (BDFDB.getParentEle(BDFDB.dotCN.members, wrapper)) key = "changeInMemberList"; else if (BDFDB.getParentEle(BDFDB.dotCN.members, wrapper)) key = "changeInMemberList";
else if (BDFDB.getParentEle(BDFDB.dotCN.dmguild, wrapper)) key = "changeInRecentDms"; else if (BDFDB.getParentEle(BDFDB.dotCN.guildouter, wrapper)) key = "changeInRecentDms";
else if (BDFDB.getParentEle(BDFDB.dotCN.dmchannels, wrapper)) key = "changeInDmsList"; else if (BDFDB.getParentEle(BDFDB.dotCN.dmchannels, wrapper)) key = "changeInDmsList";
else if (BDFDB.getParentEle(BDFDB.dotCN.channelheaderheaderbar, wrapper)) key = "changeInDmHeader"; else if (BDFDB.getParentEle(BDFDB.dotCN.channelheaderheaderbar, wrapper)) key = "changeInDmHeader";
else if (BDFDB.getParentEle(BDFDB.dotCN.callavatarwrapper, wrapper) || BDFDB.getParentEle(BDFDB.dotCN.callincoming, wrapper) || BDFDB.getParentEle(BDFDB.dotCN.callcurrentcontainer, wrapper) || BDFDB.getParentEle(BDFDB.dotCN.pictureinpicture, wrapper)) key = "changeInDmCalls"; else if (BDFDB.getParentEle(BDFDB.dotCN.callavatarwrapper, wrapper) || BDFDB.getParentEle(BDFDB.dotCN.callincoming, wrapper) || BDFDB.getParentEle(BDFDB.dotCN.callcurrentcontainer, wrapper) || BDFDB.getParentEle(BDFDB.dotCN.pictureinpicture, wrapper)) key = "changeInDmCalls";

View File

@ -3,7 +3,7 @@
class ServerFolders { class ServerFolders {
getName () {return "ServerFolders";} getName () {return "ServerFolders";}
getVersion () {return "6.3.0";} getVersion () {return "6.3.1";}
getAuthor () {return "DevilBro";} getAuthor () {return "DevilBro";}
@ -11,8 +11,7 @@ class ServerFolders {
initConstructor () { initConstructor () {
this.changelog = { this.changelog = {
"fixed":[["Mentions","Fixed mentions not updating properly"],["AutoPlayGifs","Now works properly with AutoPlayGifs"]], "fixed":[["Settings","Fixed collision between ForceCloseAllFolders and ForceOpenFolderOfSelectedServer Settings"]],
"improved":[["BD Guild classes","Added the BD classes for folders"]]
}; };
this.labels = {}; this.labels = {};
@ -603,9 +602,12 @@ class ServerFolders {
this.updateCopyInFolderContent(wrapper, folderdiv); this.updateCopyInFolderContent(wrapper, folderdiv);
this.updateFolderNotifications(folderdiv); this.updateFolderNotifications(folderdiv);
} }
BDFDB.addEventListener(this, wrapper, "click", () => { BDFDB.addEventListener(this, wrapper, "click", () => {setImmediate(() => {
if (BDFDB.getData("closeAllFolders", this, "settings")) document.querySelectorAll(BDFDB.dotCNS.guildswrapper + BDFDB.dotCN.guildouter + ".folder.open").forEach(openFolder => {this.openCloseFolder(openFolder);}); var newsettings = BDFDB.getAllData(this, "settings")
}); if (newsettings.closeAllFolders) document.querySelectorAll(BDFDB.dotCNS.guildswrapper + BDFDB.dotCN.guildouter + ".folder.open").forEach(openFolder => {
if (!newsettings.forceOpenFolder || !this.foldercontent.querySelector(`${BDFDB.dotCN.guildouter}[folder="${openFolder.id}"][guild="${this.CurrentGuildStore.getGuildId()}"]`)) this.openCloseFolder(openFolder);
});
})});
BDFDB.addEventListener(this, wrapper, "mousedown", e => { BDFDB.addEventListener(this, wrapper, "mousedown", e => {
if (BDFDB.pressedKeys.includes(17)) { if (BDFDB.pressedKeys.includes(17)) {
BDFDB.stopEvent(e); BDFDB.stopEvent(e);
@ -1265,8 +1267,7 @@ class ServerFolders {
if (BDFDB.pressedKeys.includes(46)) this.removeServerFromFolder(info, folderdiv); if (BDFDB.pressedKeys.includes(46)) this.removeServerFromFolder(info, folderdiv);
else { else {
let settings = BDFDB.getAllData(this, "settings"); let settings = BDFDB.getAllData(this, "settings");
if (settings.closeAllFolders) document.querySelectorAll(BDFDB.dotCNS.guildswrapper + BDFDB.dotCN.guildouter + ".folder.open").forEach(openFolder => {this.openCloseFolder(openFolder);}); if (!settings.closeAllFolders && settings.closeTheFolder) this.openCloseFolder(folderdiv);
else if (settings.closeTheFolder) this.openCloseFolder(folderdiv);
guilddiv.querySelector("a").click(); guilddiv.querySelector("a").click();
} }
}); });
@ -1389,11 +1390,12 @@ class ServerFolders {
let folderdivbadges = folderdiv.querySelector(BDFDB.dotCN.guildbadgewrapper); let folderdivbadges = folderdiv.querySelector(BDFDB.dotCN.guildbadgewrapper);
let masks = folderdiv.querySelectorAll("mask rect"); let masks = folderdiv.querySelectorAll("mask rect");
let mentions = 0, unread = false, audioenabled = false, videoenabled = false; let mentions = 0, unread = false, selected = false, audioenabled = false, videoenabled = false;
includedServers.forEach(div => { includedServers.forEach(div => {
let props = BDFDB.getReactValue(div, "return.stateNode.props"); let props = BDFDB.getReactValue(div, "return.stateNode.props");
mentions += parseInt(props.badge); mentions += parseInt(props.badge);
if (props.selected) selected = true;
if (props.unread) unread = true; if (props.unread) unread = true;
if (props.audio) audioenabled = true; if (props.audio) audioenabled = true;
if (props.video) videoenabled = true; if (props.video) videoenabled = true;