Adding strike instruction

client/stylesheets/base.less

@@ -1689,7 +1689,7 @@ a.github-fork {
 			}
 		}
 		> .users-typing {
-			float: right;
+			float: left;
 			height: 20px;
 			font-size: 12px;
 			color: #888;

client/views/app/chatWindowDashboard.html

@@ -57,7 +57,6 @@
 		<footer class="footer">
 			<form class="message-form" method="post" action="/">
 				<div>
-					<!--input type="text" class="input-message" value="" /-->
 					{{> messagePopupConfig getPupupConfig}}
 					<textarea name="msg" class="input-message"></textarea>
 					<i class="icon-paper-plane" title="{{_ "chatWindowDashboard.Send_Message"}}"></i>
@@ -83,6 +82,7 @@
 				<div class="formatting-tips" aria-hidden="true">
 					<b>*bold*</b>
 					<i>_italics_</i>
+					<strike>~strike~</strike>
 					<code class="inline">`inline code`</code>
 					<code class="inline">```multi-line```</code>
 					<q>&gt;quote</q>

packages/rocketchat-markdown/markdown.coffee

@@ -6,15 +6,21 @@
 class Markdown
 	constructor: (message) ->
 
-		msg = message.html or ''
+		if _.trim message.html
 
-		# Process MD like for strong, italic and strike
-		msg = msg.replace(/(\ |^)\*([^*]+)\*(\ |$)/gm, '$1<strong>$2</strong>$3')
-		msg = msg.replace(/(\ |^)\_([^_]+)\_(\ |$)/gm, '$1<em>$2</em>$3')
-		msg = msg.replace(/(\ |^)\`([^`]+)\`(\ |$)/gm, '$1<code class="inline">$2</code>$3')
-		msg = msg.replace(/(\ |^)\~{1,2}([^~]+)\~{1,2}(\ |$)/gm, '$1<strike>$2</strike>$3')
+			msg = message.html
+
+			# Process MD like for strong, italic and strike
+			msg = msg.replace(/(\ |^)\*([^*]+)\*(\ |$)/gm, '$1<strong>$2</strong>$3')
+			msg = msg.replace(/(\ |^)\_([^_]+)\_(\ |$)/gm, '$1<em>$2</em>$3')
+			msg = msg.replace(/(\ |^)\`([^`]+)\`(\ |$)/gm, '$1<code class="inline">$2</code>$3')
+			msg = msg.replace(/(\ |^)\~{1,2}([^~]+)\~{1,2}(\ |$)/gm, '$1<strike>$2</strike>$3')
+			msg = msg.replace(/^&gt;(.*)$/gm, '<q>$1</q>')
+
+			message.html = msg
+
+			console.log 'Markdown', message if window.rocketDebug
 
-		message.html = msg
 		return message
 
 RocketChat.callbacks.add 'renderMessage', Markdown, RocketChat.callbacks.priority.LOW