diff --git a/Plugins/PluginRepo/PluginRepo.plugin.js b/Plugins/PluginRepo/PluginRepo.plugin.js index 65d350c5f5..7abc34f694 100644 --- a/Plugins/PluginRepo/PluginRepo.plugin.js +++ b/Plugins/PluginRepo/PluginRepo.plugin.js @@ -3,7 +3,7 @@ class PluginRepo { getName () {return "PluginRepo";} - getVersion () {return "1.6.7";} + getVersion () {return "1.6.9";} getAuthor () {return "DevilBro";} @@ -383,9 +383,9 @@ class PluginRepo { } var pluginRepoModal = BDFDB.htmlToElement(this.pluginRepoModalMarkup); - var hiddenSettings = Object.assign({},BDFDB.loadAllData(this, "hidden")); + var hiddenSettings = BDFDB.loadAllData(this, "hidden"); pluginRepoModal.querySelector("#input-hideupdated").checked = hiddenSettings.updated || showOnlyOutdated; - pluginRepoModal.querySelector("#input-hideoutdated").checked = hiddenSettings.outdated || showOnlyOutdated; + pluginRepoModal.querySelector("#input-hideoutdated").checked = hiddenSettings.outdated && !showOnlyOutdated; pluginRepoModal.querySelector("#input-hidedownloadable").checked = hiddenSettings.downloadable || showOnlyOutdated; if (!BDFDB.isRestartNoMoreEnabled()) pluginRepoModal.querySelector("#RNMoption").remove(); else pluginRepoModal.querySelector("#input-rnmstart").checked = BDFDB.loadData("RNMstart", this, "settings"); @@ -399,6 +399,7 @@ class PluginRepo { pluginRepoModal.searchTimeout = setTimeout(() => {this.sortEntries(pluginRepoModal);},1000); }); BDFDB.addChildEventListener(pluginRepoModal, "change", ".hide-checkbox", e => { + pluginRepoModal.updateHidden = true; BDFDB.saveData(e.currentTarget.value, e.currentTarget.checked, this, "hidden"); }); BDFDB.addChildEventListener(pluginRepoModal, "change", "#input-rnmstart", e => { @@ -411,12 +412,9 @@ class PluginRepo { BDFDB.createSortPopout(e.currentTarget, this.orderPopoutMarkup, () => {this.sortEntries(pluginRepoModal);}); }); BDFDB.addChildEventListener(pluginRepoModal, "click", BDFDB.dotCN.tabbaritem + "[tab=plugins]", e => { - if (!e.currentTarget.classList.contains(BDFDB.disCN.settingsitemselected)) { - var newHiddenSettings = BDFDB.loadAllData(this, "hidden"); - if (!BDFDB.equals(newHiddenSettings, hiddenSettings)) { - hiddenSettings = Object.assign({},newHiddenSettings); - this.sortEntries(pluginRepoModal); - } + if (!e.currentTarget.classList.contains(BDFDB.disCN.settingsitemselected) && pluginRepoModal.updateHidden) { + delete pluginRepoModal.updateHidden; + this.sortEntries(pluginRepoModal); } }); @@ -811,12 +809,8 @@ class PluginRepo { filename = filename[filename.length - 1]; var file = path.join(BDFDB.getPluginsFolder(), filename); fileSystem.unlink(file, (error) => { - if (error) { - BDFDB.showToast(`Unable to delete Plugin "${filename}".`, {type:"danger"}); - } - else { - BDFDB.showToast(`Successfully deleted Plugin "${filename}".`, {type:"success"}); - } + if (error) BDFDB.showToast(`Unable to delete Plugin "${filename}".`, {type:"danger"}); + else BDFDB.showToast(`Successfully deleted Plugin "${filename}".`, {type:"success"}); }); } diff --git a/Plugins/ThemeRepo/ThemeRepo.plugin.js b/Plugins/ThemeRepo/ThemeRepo.plugin.js index c2c090fdf1..aeb70af597 100644 --- a/Plugins/ThemeRepo/ThemeRepo.plugin.js +++ b/Plugins/ThemeRepo/ThemeRepo.plugin.js @@ -3,7 +3,7 @@ class ThemeRepo { getName () {return "ThemeRepo";} - getVersion () {return "1.6.8";} + getVersion () {return "1.6.9";} getAuthor () {return "DevilBro";} @@ -472,7 +472,7 @@ class ThemeRepo { var frame = BDFDB.htmlToElement(this.frameMarkup); var lightTheme = BDFDB.getDiscordTheme() == BDFDB.disCN.themelight; var themeRepoModal = BDFDB.htmlToElement(this.themeRepoModalMarkup); - var hiddenSettings = Object.assign({},BDFDB.loadAllData(this, "hidden")); + var hiddenSettings = BDFDB.loadAllData(this, "hidden"); var darklightinput = themeRepoModal.querySelector("#input-darklight"); var customcssinput = themeRepoModal.querySelector("#input-customcss"); var themefixerinput = themeRepoModal.querySelector("#input-themefixer"); @@ -480,7 +480,7 @@ class ThemeRepo { customcssinput.checked = false; themefixerinput.checked = false; themeRepoModal.querySelector("#input-hideupdated").checked = hiddenSettings.updated || showOnlyOutdated; - themeRepoModal.querySelector("#input-hideoutdated").checked = hiddenSettings.outdated || showOnlyOutdated; + themeRepoModal.querySelector("#input-hideoutdated").checked = hiddenSettings.outdated && !showOnlyOutdated; themeRepoModal.querySelector("#input-hidedownloadable").checked = hiddenSettings.downloadable || showOnlyOutdated; if (!BDFDB.isRestartNoMoreEnabled()) themeRepoModal.querySelector("#RNMoption").remove(); else themeRepoModal.querySelector("#input-rnmstart").checked = BDFDB.loadData("RNMstart", this, "settings"); @@ -512,6 +512,7 @@ class ThemeRepo { themeRepoModal.searchTimeout = setTimeout(() => {this.sortEntries(themeRepoModal);},1000); }); BDFDB.addChildEventListener(themeRepoModal, "change", ".hide-checkbox", e => { + themeRepoModal.updateHidden = true; BDFDB.saveData(e.currentTarget.value, e.currentTarget.checked, this, "hidden"); }); BDFDB.addChildEventListener(themeRepoModal, "change", "#input-rnmstart", e => { @@ -525,9 +526,8 @@ class ThemeRepo { }); BDFDB.addChildEventListener(themeRepoModal, "click", BDFDB.dotCN.tabbaritem + "[tab=themes]", e => { if (!e.currentTarget.classList.contains(BDFDB.disCN.settingsitemselected)) { - var newHiddenSettings = BDFDB.loadAllData(this, "hidden"); - if (!BDFDB.equals(newHiddenSettings, hiddenSettings)) { - hiddenSettings = Object.assign({},newHiddenSettings); + if (themeRepoModal.updateHidden) { + delete themeRepoModal.updateHidden; this.sortEntries(themeRepoModal); } } @@ -606,7 +606,7 @@ class ThemeRepo { trashbutton.addEventListener("click", e => { if (entry.classList.contains("outdated") || entry.classList.contains("updated")) { setEntryState(2); - this.deletePluginFile(data); + this.deleteThemeFile(data); if (!BDFDB.isRestartNoMoreEnabled()) this.removeTheme(data); } });