Merge pull request #53 from BenLubar/paste-to-upload-category

Fix paste-to-upload permissions and Edge support

static/lib/composer/uploads.js

@@ -180,16 +180,17 @@ define('composer/uploads', [
 					return false;
 				}
 
-				blob.name = 'upload-' + utils.generateUUID();
+				var blobName = 'upload-' + utils.generateUUID();
 
 				var fd = null;
 				if (window.FormData) {
 					fd = new FormData();
-					fd.append('files[]', blob, blob.name);
+					fd.append('files[]', blob, blobName);
 				}
 
 				uploadContentFiles({
 					files: [blob],
+					fileNames: [blobName],
 					post_uuid: post_uuid,
 					route: '/api/post/upload',
 					formData: fd
@@ -234,7 +235,7 @@ define('composer/uploads', [
 		var filenameMapping = [];
 
 		for (var i = 0; i < files.length; ++i) {
-			filenameMapping.push(i + '_' + Date.now() + '_' + files[i].name);
+			filenameMapping.push(i + '_' + Date.now() + '_' + (params.fileNames ? params.fileNames[i] : files[i].name));
 			var isImage = files[i].type.match(/image./);
 
 			if (files[i].size > parseInt(config.maximumFileSize, 10) * 1024) {
@@ -257,6 +258,10 @@ define('composer/uploads', [
 			uploads.inProgress[post_uuid] = uploads.inProgress[post_uuid] || [];
 			uploads.inProgress[post_uuid].push(1);
 
+			if (params.formData) {
+				params.formData.append('cid', cid);
+			}
+
 			$(this).ajaxSubmit({
 				headers: {
 					'x-csrf-token': csrf.get()