toast setting affects emotes

This commit is contained in:
Zack Rauen 2018-02-13 11:06:19 -05:00
parent 2250bf1a8e
commit 8533d76aa8
2 changed files with 5 additions and 5 deletions

View File

@ -769,7 +769,7 @@ EmoteModule.prototype.loadEmoteData = async function(emoteInfo) {
if (exists && !bdConfig.cache.expired) { if (exists && !bdConfig.cache.expired) {
mainCore.showToast("Loading emotes from cache.", {type: "info"}); if (settingsCookie["fork-ps-2"]) mainCore.showToast("Loading emotes from cache.", {type: "info"});
utils.log("[Emotes] Loading emotes from local cache.") utils.log("[Emotes] Loading emotes from local cache.")
let data = _fs.readFileSync(file, "utf8"); let data = _fs.readFileSync(file, "utf8");
let isValid = this.testJSON(data); let isValid = this.testJSON(data);
@ -782,7 +782,7 @@ EmoteModule.prototype.loadEmoteData = async function(emoteInfo) {
if (isValid) { if (isValid) {
await this.goBack(emoteInfo) await this.goBack(emoteInfo)
mainCore.showToast("Emotes successfully loaded.", {type: "success"}) if (settingsCookie["fork-ps-2"]) mainCore.showToast("Emotes successfully loaded.", {type: "success"})
return; return;
} }
@ -790,7 +790,7 @@ EmoteModule.prototype.loadEmoteData = async function(emoteInfo) {
_fs.unlinkSync(file); _fs.unlinkSync(file);
} }
mainCore.showToast("Downloading emotes in the background do not reload.", {type: "info"}); if (settingsCookie["fork-ps-2"]) mainCore.showToast("Downloading emotes in the background do not reload.", {type: "info"});
for (let e in emoteInfo) { for (let e in emoteInfo) {
let data = await this.downloadEmotes(emoteInfo[e]); let data = await this.downloadEmotes(emoteInfo[e]);
@ -799,7 +799,7 @@ EmoteModule.prototype.loadEmoteData = async function(emoteInfo) {
await this.goBack(emoteInfo) await this.goBack(emoteInfo)
mainCore.showToast("All emotes successfully downloaded.", {type: "success"}); if (settingsCookie["fork-ps-2"]) mainCore.showToast("All emotes successfully downloaded.", {type: "success"});
try { _fs.writeFileSync(file, JSON.stringify(bdEmotes), "utf8"); } try { _fs.writeFileSync(file, JSON.stringify(bdEmotes), "utf8"); }
catch(err) { utils.err("[Emotes] Could not save emote data.", err); } catch(err) { utils.err("[Emotes] Could not save emote data.", err); }

2
js/main.min.js vendored

File diff suppressed because one or more lines are too long