From 556b06ac2db6bf4818983fad47e751eb79c44b57 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 24 Oct 2022 12:26:50 -0400 Subject: [PATCH] fix: remove success toast on settings.save, navigation, widgets --- public/language/en-GB/admin/admin.json | 2 -- public/src/admin/extend/widgets.js | 14 ++++++-------- public/src/admin/settings.js | 8 -------- public/src/admin/settings/navigation.js | 6 +++++- public/src/modules/settings.js | 11 +++++------ 5 files changed, 16 insertions(+), 25 deletions(-) diff --git a/public/language/en-GB/admin/admin.json b/public/language/en-GB/admin/admin.json index 39edffb66f..dcf9696ca2 100644 --- a/public/language/en-GB/admin/admin.json +++ b/public/language/en-GB/admin/admin.json @@ -4,8 +4,6 @@ "acp-title": "%1 | NodeBB Admin Control Panel", "settings-header-contents": "Contents", - "changes-saved": "Changes Saved", - "changes-saved-message": "Your changes to the NodeBB configuration have been saved.", "changes-not-saved": "Changes Not Saved", "changes-not-saved-message": "NodeBB encountered a problem saving your changes. (%1)" } \ No newline at end of file diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index dbbfd6c2e6..2f608b3620 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -127,16 +127,14 @@ define('admin/extend/widgets', [ socket.emit('admin.widgets.set', saveData, function (err) { if (err) { - alerts.error(err); + return alerts.error(err); } - alerts.alert({ - alert_id: 'admin:widgets', - type: 'success', - title: '[[admin/extend/widgets:alert.updated]]', - message: '[[admin/extend/widgets:alert.update-success]]', - timeout: 2500, - }); + const saveBtn = document.getElementById('save'); + saveBtn.classList.toggle('saved', true); + setTimeout(() => { + saveBtn.classList.toggle('saved', false); + }, 5000); }); } diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js index 65e809b314..916b274b94 100644 --- a/public/src/admin/settings.js +++ b/public/src/admin/settings.js @@ -84,14 +84,6 @@ define('admin/settings', ['uploader', 'mousetrap', 'hooks', 'alerts'], function saveBtn.get(0).classList.toggle('saved', false); }, 5000); - alerts.alert({ - alert_id: 'config_status', - timeout: 2500, - title: '[[admin/admin:changes-saved]]', - message: '[[admin/admin:changes-saved-message]]', - type: 'success', - }); - hooks.fire('action:admin.settingsSaved'); }); }); diff --git a/public/src/admin/settings/navigation.js b/public/src/admin/settings/navigation.js index 7709acf855..6ae9fa1918 100644 --- a/public/src/admin/settings/navigation.js +++ b/public/src/admin/settings/navigation.js @@ -145,7 +145,11 @@ define('admin/settings/navigation', [ if (err) { alerts.error(err); } else { - alerts.success('Successfully saved navigation'); + const saveBtn = document.getElementById('save'); + saveBtn.classList.toggle('saved', true); + setTimeout(() => { + saveBtn.classList.toggle('saved', false); + }, 5000); } }); } diff --git a/public/src/modules/settings.js b/public/src/modules/settings.js index e194b8fe59..6adad09536 100644 --- a/public/src/modules/settings.js +++ b/public/src/modules/settings.js @@ -550,12 +550,11 @@ define('settings', ['hooks', 'alerts'], function (hooks, alerts) { timeout: 2500, }); } else { - alerts.alert({ - title: '[[admin/admin:changes-saved]]', - message: '[[admin/admin:changes-saved-message]]', - type: 'success', - timeout: 2500, - }); + const saveBtn = document.getElementById('save'); + saveBtn.classList.toggle('saved', true); + setTimeout(() => { + saveBtn.classList.toggle('saved', false); + }, 5000); } }); }