Merge pull request #362 from RocketChat/upload

Upload
RocketChat · Jul 29, 2015 · e9e5e57 · e9e5e57
2 parents c8c9cf7 + 22a9a22
commit e9e5e57
Show file tree

Hide file tree

Showing 4 changed files with 263 additions and 220 deletions.
diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
@@ -3308,3 +3308,32 @@ a.github-fork {
 		}
 	}
 }
+
+.dropzone {
+	.dropzone-overlay {
+		display: none;
+	}
+
+	&.over .dropzone-overlay {
+		background-color: rgba(0, 0, 0, 0.5);
+		position: fixed;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		z-index: 1000000;
+		display: block;
+		color: white;
+		font-size: 50px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		> div {
+			background-color: rgba(0,0,0,0.6);
+			padding: 40px;
+			border-radius: 10px;
+			pointer-events: none;
+		}
+	}
+}
diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee
@@ -457,26 +457,22 @@ Template.room.events
 	'click .stop-video': (event) ->
 		webrtc.stop()
 
-	'dragenter #dropzone': (e) ->
-		console.log 'DRAG ENTER'
+	'dragenter .dropzone': (e) ->
+		e.currentTarget.classList.add 'over'
 
-	'dragleave #dropzone': (e) ->
-		console.log 'DRAG OUT'
+	'dragleave .dropzone-overlay': (e) ->
+		e.currentTarget.parentNode.classList.remove 'over'
+
+	'dropped .dropzone-overlay': (e) ->
+		e.currentTarget.parentNode.classList.remove 'over'
 
-	'dropped #dropzone': (e) ->
 		FS?.Utility?.eachFile e, (file) ->
 			newFile = new (FS.File)(file)
 			newFile.rid = Session.get('openedRoom')
+			newFile.userId = Meteor.userId()
 			Files.insert newFile, (error, fileObj) ->
 				unless error
 					toastr.success 'Upload succeeded!'
-					console.log('room fileObj', fileObj) if window.rocketDebug
-					Meteor.call 'sendMessage',
-						_id: Random.id()
-						rid: fileObj.rid
-						msg: 'File Uploaded: *' + fileObj.original.name + '* \n' + document.location.origin + '/cfs/files/Files/' + fileObj._id
-						file:
-							_id: fileObj._id
 
 Template.room.onCreated ->
 	# this.scrollOnBottom = true