Index: branches/5.2.x/core/admin_templates/js/uploader/upload_manager.js
===================================================================
diff -u -N -r15411 -r15446
--- branches/5.2.x/core/admin_templates/js/uploader/upload_manager.js	(.../upload_manager.js)	(revision 15411)
+++ branches/5.2.x/core/admin_templates/js/uploader/upload_manager.js	(.../upload_manager.js)	(revision 15446)
@@ -91,6 +91,7 @@
 		function ($e) {
 			if ($me._hasQueue()) {
 				submitted = false;
+				$e.stopImmediatePropagation();
 				alert('File upload is in progress. Please cancel the upload or wait until it\'s completed.');
 
 				return false;
@@ -110,26 +111,19 @@
 	delete this._Uploaders[id];
 }
 
-UploadsManager.DeleteFile = function(uploader_id, fname, confirmed) {
-	if (!confirmed && !confirm('Are you sure you want to delete "' + fname + '" file?')) {
+UploadsManager.DeleteFile = function(uploader_id, file, confirmed) {
+	if ( !confirmed && !confirm('Are you sure you want to delete "' + file.name + '" file?') ) {
 		return false;
 	}
 
 	var $uploader = this._Uploaders[uploader_id];
 
-	Request.makeRequest(
-		$uploader.deleteURL.replace('#FILE#', encodeURIComponent(fname)).replace('#FIELD#', $uploader.params.field),
-		false, '',
-		function(req, fname, $uploader) {
-			$uploader.removeFile({id:fname})
-			$uploader.deleted.push(fname);
+	$.get(
+		$uploader.getUrl(file, 'deleteURL'),
+		function ($data) {
+			$uploader.removeFile({id: file.name}, true);
 			$uploader.updateInfo(undefined, true);
-		},
-
-		function(req, fname, $uploader) {
-			alert('Error while deleting file');
-		},
-		fname, $uploader
+		}
 	);
 
 	return true;
@@ -216,7 +210,7 @@
 					this.files.push(file);
 
 					if (this.files[0].uploaded) {
-						UploadsManager.DeleteFile(UploadsManager._getUploader(file).id, this.files[0].name, true);
+						UploadsManager.DeleteFile(UploadsManager._getUploader(file).id, this.files[0], true);
 					}
 					else {
 						this.callFlash('CancelUpload', [this.files[0].id]);