Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-16 18:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #3818

Browse Source 
set the value saved to empty string if the email is identical to
original
this causes the original to be used since empty string is falsy
This commit is contained in:
barisusakli
2016-09-01 15:32:47 +03:00
parent 6acfb02316
commit 55c9e6f4b6
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
public/src/admin/settings/email.js
View File

@@ -34,16 +34,23 @@ define('admin/settings/email', ['admin/settings'], function(settings) {
emailEditor.setTheme("ace/theme/twilight");
emailEditor.getSession().setMode("ace/mode/html");
emailEditor.on('change', function(event) {
$('#email-editor-holder').val(emailEditor.getValue());
emailEditor.on('change', function() {
var emailPath = $('#email-editor-selector').val();
var original;
ajaxify.data.emails.forEach(function(email) {
if (email.path === emailPath) {
original = email.original;
}
});
var newEmail = emailEditor.getValue();
$('#email-editor-holder').val(newEmail !== original ? newEmail : '');
});
$('button[data-action="email.revert"]').off('click').on('click', function() {
ajaxify.data.emails.forEach(function(email) {
if (email.path === $('#email-editor-selector').val()) {
emailEditor.getSession().setValue(email.original);
$('#email-editor-holder')
.val(email.original);
$('#email-editor-holder').val('');
}
});
});
@@ -56,7 +63,7 @@ define('admin/settings/email', ['admin/settings'], function(settings) {
if (email.path === $('#email-editor-selector').val()) {
emailEditor.getSession().setValue(email.text);
$('#email-editor-holder')
.val(email.text)
.val(email.text !== email.original ? email.text : '')
.attr('data-field', 'email:custom:' + email.path);
}
});

6
src/controllers/admin/settings.js
View File

@@ -19,9 +19,9 @@ settingsController.get = function(req, res, next) {
function renderEmail(req, res, next) {
var fs = require('fs'),
path = require('path'),
utils = require('../../../public/src/utils');
var fs = require('fs');
var path = require('path');
var utils = require('../../../public/src/utils');
var emailsPath = path.join(__dirname, '../../../public/templates/emails');
utils.walk(emailsPath, function(err, emails) {