Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 14:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

added error and success language files

Browse Source 
removed some code from server side that was emitting alerts
This commit is contained in:
barisusakli
2014-04-09 14:12:46 -04:00
parent d8df9ab3ed
commit e2d0d4db5c
7 changed files with 55 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
public/src/modules/composer.js
View File

@@ -168,12 +168,12 @@ define(['taskbar'], function(taskbar) {
}
}
function composerAlert(title, message) {
function composerAlert(message) {
$('.action-bar button').removeAttr('disabled');
app.alert({
type: 'danger',
timeout: 2000,
title: title,
timeout: 3000,
title: '',
message: message,
alert_id: 'post_error'
});
@@ -299,7 +299,7 @@ define(['taskbar'], function(taskbar) {
if(files[i].size > parseInt(config.maximumFileSize, 10) * 1024) {
uploadForm[0].reset();
return composerAlert('File too big', 'Maximum allowed file size is ' + config.maximumFileSize + 'kbs');
return composerAlert('[[error:file-too-big, ' + config.maximumFileSize + ']]');
}
}
@@ -499,7 +499,7 @@ define(['taskbar'], function(taskbar) {
composer.createNewComposer = function(post_uuid) {
var allowTopicsThumbnail = config.allowTopicsThumbnail && composer.posts[post_uuid].isMain && (config.hasImageUploadPlugin || config.allowFileUploads);
templates.parse('composer', {allowTopicsThumbnail: allowTopicsThumbnail}, function(composerTemplate) {
translator.translate(composerTemplate, function(composerTemplate) {
composerTemplate = $(composerTemplate);
@@ -896,13 +896,13 @@ define(['taskbar'], function(taskbar) {
var checkTitle = parseInt(postData.cid, 10) || parseInt(postData.pid, 10);
if(postData.uploadsInProgress && postData.uploadsInProgress.length) {
return composerAlert('Still uploading', 'Please wait for uploads to complete.');
return composerAlert('[[error:still-uploading]]');
} else if (checkTitle && titleEl.val().length < parseInt(config.minimumTitleLength, 10)) {
return composerAlert('Title too short', 'Please enter a longer title. At least ' + config.minimumTitleLength+ ' characters.');
return composerAlert('[[error:title-too-short, ' + config.minimumTitleLength + ']]');
} else if (checkTitle && titleEl.val().length > parseInt(config.maximumTitleLength, 10)) {
return composerAlert('Title too long', 'Please enter a shorter title. Titles can\'t be longer than ' + config.maximumTitleLength + ' characters.');
return composerAlert('[[error:title-too-long, ' + config.maximumTitleLength + ']]');
} else if (bodyEl.val().length < parseInt(config.minimumPostLength, 10)) {
return composerAlert('Content too short', 'Please enter a longer post. At least ' + config.minimumPostLength + ' characters.');
return composerAlert('[[error:content-too-short, ' + config.minimumPostLength + ']]');
}
if (parseInt(postData.cid, 10) > 0) {
@@ -929,10 +929,14 @@ define(['taskbar'], function(taskbar) {
function done(err) {
$('.action-bar button').removeAttr('disabled');
if(!err) {
composer.discard(post_uuid);
removeDraft(postData.save_id);
if (err) {
return app.alertError(err.message);
}
app.alertSuccess('[[success:topic-post]]');
composer.discard(post_uuid);
removeDraft(postData.save_id);
}
};