Merge branch 'master' of github.com:RocketChat/Rocket.Chat

# By Rodrigo Nascimento # Via Rodrigo Nascimento * 'master' of github.com:RocketChat/Rocket.Chat: Add MarkDown support Fix error when Accounts.validateLoginAttempt init with allowed false close #3 #4
RocketChat · May 25, 2015 · f2aa215 · f2aa215
2 parents e09a3a1 + 6602571
commit f2aa215
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/client/stylesheets/utils/_reset.import.less b/client/stylesheets/utils/_reset.import.less
@@ -19,7 +19,7 @@ time, mark, audio, video {
 	padding: 0;
 	border: 0;
 	font-size: 100%;
-	font: inherit;
+	// font: inherit;
 	vertical-align: baseline;
 }
 /* HTML5 display-role reset for older browsers */

diff --git a/client/views/app/chatMessageDashboard.coffee b/client/views/app/chatMessageDashboard.coffee
@@ -35,6 +35,15 @@ Template.chatMessageDashboard.helpers
 		# if $('#chat-window-' + this.rid + '.opened').length == 0
 		# 	return 'new'
 
+	preMD: Template 'preMD', ->
+		self = this
+		text = ""
+		if self.templateContentBlock
+			text = Blaze._toText(self.templateContentBlock, HTML.TEXTMODE.STRING)
+
+		text = text.replace(/#/g, '\\#')
+		return text
+
 Template.chatMessageDashboard.events
 	'mousedown .edit-message': ->
 		self = this

diff --git a/client/views/app/chatMessageDashboard.html b/client/views/app/chatMessageDashboard.html
@@ -19,7 +19,7 @@
 					<textarea class="input-message-editing" contenteditable="true">{{{message}}}</textarea>
 				{{else}}
 					<p>
-						{{#emojione}}{{{message}}}{{/emojione}}
+						{{#emojione}}{{#markdown}}{{#preMD}}{{message}}{{/preMD}}{{/markdown}}{{/emojione}}
 					</p>
 				{{/if}}
 			{{/if}}

diff --git a/server/lib/accounts.coffee b/server/lib/accounts.coffee
@@ -36,7 +36,10 @@ Accounts.onCreateUser (options, user) ->
 
 
 Accounts.validateLoginAttempt (login) ->
-	if login.allowed is true and login.type is 'password'
+	if login.allowed isnt true
+		return login.allowed
+
+	if login.type is 'password'
 		validEmail = login.user.emails.filter (email) ->
 			return email.verified is true