Merged dev into master

1 files changed, 18 insertions, 2 deletions

diff --git a/public/js/upload.js b/public/js/upload.js
index ba67d15..b52f670 100644
--- a/public/js/upload.js
+++ b/public/js/upload.js
@@ -36,7 +36,6 @@ upload.verifyToken = function(token, reloadOnError){
 		reloadOnError = false;
 	
 	axios.post('/api/tokens/verify', {
-		type: 'client',
 		token: token
 	})
   	.then(function (response) {
@@ -101,10 +100,11 @@ upload.prepareDropzone = function(){
 		maxFiles: 1000,
 		autoProcessQueue: true,
 		headers: {
-    		'auth': upload.token
+    		'token': upload.token
 		},
 		init: function() {
 			this.on('addedfile', function(file) { 
+				myDropzone = this;
 				document.getElementById('uploads').style.display = 'block';
 			});
 		}
@@ -139,6 +139,22 @@ upload.prepareDropzone = function(){
 
 }
 
+//Handle image paste event
+window.addEventListener('paste', function(event) {
+	var items = (event.clipboardData || event.originalEvent.clipboardData).items;
+	for (index in items) {
+		var item = items[index];
+		if (item.kind === 'file') {
+			var blob = item.getAsFile();
+			console.log(blob.type);
+			var file = new File([blob], "pasted-image."+blob.type.match(/(?:[^\/]*\/)([^;]*)/)[1]);
+			file.type = blob.type;
+			console.log(file);
+			myDropzone.addFile(file);
+		}
+	}
+});
+
 window.onload = function () {
 	upload.checkIfPublic();
 };
\ No newline at end of file