add default cursor position on drag/drop

--- src/components/dashboard/dashboard.directive.coffee
+++ src/components/dashboard/dashboard.directive.coffee
@@ -471,7 +471,7 @@
         #   w.style.clear = 'none'

       # Options
-      # cursorAt: {left: 100, top: 20}
+      cursorAt: {left: 100, top: 20}
       opacity: 0.5
       delay: 150
       tolerance: 'pointer'


Fixing call to underscore.string 'trim' method to avoid conflicts with Underscore test stubs.

--- packages/rocketchat-markdown/markdown.coffee
+++ packages/rocketchat-markdown/markdown.coffee
@@ -6,7 +6,7 @@
 class Markdown
 	constructor: (message) ->

-		if _s.trim message.html
+		if s.trim message.html

 			msg = message.html


xss: use mathiasbynens/he

xss: use mathiasbynens/he

--- client/ide/filetree/itemviews/fileitem.coffee
+++ client/ide/filetree/itemviews/fileitem.coffee
@@ -78,7 +78,7 @@
   pistachio:->
     data = @getData()
     path = FSHelper.plainPath data.path
-    name = Encoder.XSSEncode data.name
+    name = KD.utils.xssEncode data.name
     """
       {{> @icon}}
       {{> @loader}}