parse upload picture modal on demand

public/src/modules/uploader.js

@@ -1,17 +1,21 @@
 'use strict';
 
-/* globals define */
+/* globals define, templates, translator */
 
 define('uploader', ['csrf'], function(csrf) {
 
 	var module = {};
 
 	module.open = function(route, params, fileSize, callback) {
-		var uploadModal = $('#upload-picture-modal');
-		uploadModal.modal('show').removeClass('hide');
-		module.hideAlerts();
-		var uploadForm = $('#uploadForm');
-		uploadForm[0].reset();
+		parseModal(function(uploadModal) {
+			uploadModal = $(uploadModal);
+
+			uploadModal.modal('show');
+		 	uploadModal.on('hidden.bs.modal', function() {
+				uploadModal.remove();
+			});
+
+			var uploadForm = uploadModal.find('#uploadForm');
 			uploadForm.attr('action', route);
 			uploadForm.find('#params').val(JSON.stringify(params));
 
@@ -23,14 +27,14 @@ define('uploader', ['csrf'], function(csrf) {
 				uploadForm.find('#file-size-block').addClass('hide');
 			}
 
-		$('#pictureUploadSubmitBtn').off('click').on('click', function() {
+			uploadModal.find('#pictureUploadSubmitBtn').off('click').on('click', function() {
 				uploadForm.submit();
 			});
 
 			uploadForm.off('submit').submit(function() {
 
 				function showAlert(type, message) {
-				module.hideAlerts();
+					module.hideAlerts(uploadModal);
 					uploadModal.find('#alert-' + type).translateText(message).removeClass('hide');
 				}
 
@@ -39,7 +43,7 @@ define('uploader', ['csrf'], function(csrf) {
 				uploadModal.find('#upload-progress-bar').css('width', '0%');
 				uploadModal.find('#upload-progress-box').show().removeClass('hide');
 
-			if (!$('#userPhotoInput').val()) {
+				if (!uploadModal.find('#userPhotoInput').val()) {
 					showAlert('error', '[[uploads:select-file-to-upload]]');
 					return false;
 				}
@@ -77,8 +81,15 @@ define('uploader', ['csrf'], function(csrf) {
 
 				return false;
 			});
+		});
 	};
 
+	function parseModal(callback) {
+		templates.parse('partials/modals/upload_picture_modal', {}, function(html) {
+			translator.translate(html, callback);
+		});
+	}
+
 	function maybeParse(response) {
 		if (typeof response === 'string') {
 			try {
@@ -90,8 +101,8 @@ define('uploader', ['csrf'], function(csrf) {
 		return response;
 	}
 
-	module.hideAlerts = function() {
-		$('#upload-picture-modal').find('#alert-status, #alert-success, #alert-error, #upload-progress-box').addClass('hide');
+	module.hideAlerts = function(modal) {
+		modal.find('#alert-status, #alert-success, #alert-error, #upload-progress-box').addClass('hide');
 	};
 
 	return module;