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

uploads cleanup

Browse Source
This commit is contained in:
barisusakli
2014-05-19 15:33:41 -04:00
parent 152a307b51
commit 20a707e6c1
1 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
public/src/modules/composer/uploads.js
View File

@@ -201,15 +201,13 @@ define(function() {
function uploadContentFiles(params) { function uploadContentFiles(params) {
var files = params.files, var files = params.files,
post_uuid = params.post_uuid, post_uuid = params.post_uuid,
route = params.route,
formData = params.formData, formData = params.formData,
callback = params.callback,
postContainer = $('#cmp-uuid-' + post_uuid), postContainer = $('#cmp-uuid-' + post_uuid),
textarea = postContainer.find('textarea'), textarea = postContainer.find('textarea'),
text = textarea.val(), text = textarea.val(),
uploadForm = postContainer.find('#fileForm'); uploadForm = postContainer.find('#fileForm');
uploadForm.attr('action', route); uploadForm.attr('action', params.route);
for(var i = 0; i < files.length; ++i) { for(var i = 0; i < files.length; ++i) {
var isImage = files[i].type.match(/image./); var isImage = files[i].type.match(/image./);
@@ -244,14 +242,7 @@ define(function() {
clearForm: true, clearForm: true,
formData: formData, formData: formData,
error: function(xhr) { error: onUploadError,
xhr = maybeParse(xhr);
app.alertError('Error uploading file!\nStatus : ' + xhr.status + '\nMessage : ' + xhr.responseText);
if (typeof callback === 'function') {
callback(xhr);
}
},
uploadProgress: function(event, position, total, percent) { uploadProgress: function(event, position, total, percent) {
for(var i=0; i < files.length; ++i) { for(var i=0; i < files.length; ++i) {
@@ -269,9 +260,6 @@ define(function() {
} }
textarea.focus(); textarea.focus();
if (typeof callback === 'function') {
callback(null, uploads);
}
}, },
complete: function() { complete: function() {
@@ -288,14 +276,12 @@ define(function() {
function uploadTopicThumb(params) { function uploadTopicThumb(params) {
var post_uuid = params.post_uuid, var post_uuid = params.post_uuid,
route = params.route,
formData = params.formData, formData = params.formData,
callback = params.callback,
postContainer = $('#cmp-uuid-' + post_uuid), postContainer = $('#cmp-uuid-' + post_uuid),
spinner = postContainer.find('.topic-thumb-spinner'), spinner = postContainer.find('.topic-thumb-spinner'),
thumbForm = postContainer.find('#thumbForm'); thumbForm = postContainer.find('#thumbForm');
thumbForm.attr('action', route); thumbForm.attr('action', params.route);
thumbForm.off('submit').submit(function() { thumbForm.off('submit').submit(function() {
var csrf = $('#csrf_token').val(); var csrf = $('#csrf_token').val();
@@ -312,21 +298,11 @@ define(function() {
$(this).ajaxSubmit({ $(this).ajaxSubmit({
formData: formData, formData: formData,
error: function(xhr) { error: onUploadError,
xhr = maybeParse(xhr);
app.alertError('Error uploading file!\nStatus : ' + xhr.status + '\nMessage : ' + xhr.responseText);
if (typeof callback === 'function') {
callback(xhr);
}
},
success: function(uploads) { success: function(uploads) {
uploads = maybeParse(uploads); uploads = maybeParse(uploads);
postContainer.find('#topic-thumb-url').val((uploads[0] || {}).url || '').trigger('change'); postContainer.find('#topic-thumb-url').val((uploads[0] || {}).url || '').trigger('change');
if (typeof callback === 'function') {
callback(null, uploads);
}
}, },
complete: function() { complete: function() {
uploads[post_uuid].pop(); uploads[post_uuid].pop();
@@ -338,6 +314,12 @@ define(function() {
thumbForm.submit(); thumbForm.submit();
} }
function onUploadError(xhr) {
xhr = maybeParse(xhr);
app.alertError('[[error:upload-error, ' + xhr.responseText + ']]');
}
return uploads; return uploads;
}); });