refactor/cleanup uploader.js

public/src/modules/uploader.js

@@ -1,6 +1,6 @@
 'use strict';
 
-/* globals define, templates, translator */
+/* globals define, templates */
 
 define('uploader', ['csrf', 'translator'], function(csrf, translator) {
 
@@ -35,12 +35,18 @@ define('uploader', ['csrf', 'translator'], function(csrf, translator) {
 			uploadForm.attr('action', data.route);
 			uploadForm.find('#params').val(JSON.stringify(data.params));
 
-			uploadModal.find('#fileUploadSubmitBtn').off('click').on('click', function() {
+			uploadModal.find('#fileUploadSubmitBtn').on('click', function() {
 				uploadForm.submit();
 			});
 
-			uploadForm.off('submit').submit(function() {
+			uploadForm.submit(function() {
+				onSubmit(uploadModal, callback);
+				return false;
+			});
+		});
+	};
 
+	function onSubmit(uploadModal, callback) {
 		function showAlert(type, message) {
 			module.hideAlerts(uploadModal);
 			uploadModal.find('#alert-' + type).translateText(message).removeClass('hide');
@@ -52,11 +58,10 @@ define('uploader', ['csrf', 'translator'], function(csrf, translator) {
 		uploadModal.find('#upload-progress-box').show().removeClass('hide');
 
 		if (!uploadModal.find('#fileInput').val()) {
-					showAlert('error', '[[uploads:select-file-to-upload]]');
+			return showAlert('error', '[[uploads:select-file-to-upload]]');
-					return false;
 		}
 
-				$(this).ajaxSubmit({
+		uploadModal.find('#uploadForm').ajaxSubmit({
 			headers: {
 				'x-csrf-token': csrf.get()
 			},
@@ -64,17 +69,14 @@ define('uploader', ['csrf', 'translator'], function(csrf, translator) {
 				xhr = maybeParse(xhr);
 				showAlert('error', xhr.responseJSON ? (xhr.responseJSON.error || xhr.statusText) : 'error uploading, code : ' + xhr.status);
 			},
-
 			uploadProgress: function(event, position, total, percent) {
 				uploadModal.find('#upload-progress-bar').css('width', percent + '%');
 			},
-
 			success: function(response) {
 				response = maybeParse(response);
 
 				if (response.error) {
-							showAlert('error', response.error);
+					return showAlert('error', response.error);
-							return;
 				}
 
 				callback(response[0].url);
@@ -86,11 +88,7 @@ define('uploader', ['csrf', 'translator'], function(csrf, translator) {
 				}, 750);
 			}
 		});
-
+	}
-				return false;
-			});
-		});
-	};
 
 	function parseModal(tplVals, callback) {
 		templates.parse('partials/modals/upload_file_modal', tplVals, function(html) {