From d49ee1326b3eeff37bc32de7f1e68e1a543e2e25 Mon Sep 17 00:00:00 2001
From: Mattias Erming <mattias@mattiaserming.com>
Date: Mon, 21 Apr 2014 12:27:43 +0200
Subject: [PATCH] Parse URLs with Handlebars

---
 client/index.html |  2 +-
 client/js/chat.js | 43 ++++++++++++++++++++++++++++++-------------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/client/index.html b/client/index.html
index 0e5ffc82..e50fcbec 100644
--- a/client/index.html
+++ b/client/index.html
@@ -114,7 +114,7 @@
 		<div class="time">{{time}}</div>
 		<div class="user">{{from}}</div>
 		<div class="type">{{type}}</div>
-		<div class="text">{{text}}</div>
+		<div class="text">{{{uri text}}}</div>
 	</div>
 	{{/each}}
 	</script>
diff --git a/client/js/chat.js b/client/js/chat.js
index 68c54fac..1331b2c0 100644
--- a/client/js/chat.js
+++ b/client/js/chat.js
@@ -35,13 +35,6 @@ $(function() {
 		return tpl[id](json);
 	}
 	
-	Handlebars.registerHelper(
-		"partial",
-		function(id) {
-			return new Handlebars.SafeString(render(id, this));
-		}
-	);
-	
 	function handleEvent(event, json) {
 		var data = json.data;
 		switch (event) {
@@ -244,12 +237,6 @@ $(function() {
 	chat.on("focus", "input[type=text]", function() {
 		$(this).closest(".window").find(".messages").scrollToBottom();
 	});
-	
-	function uri(text) {
-		return URI.withinString(text, function(url) {
-			return "<a href='" + url + "' target='_blank'>" + url + "</a>";
-		});
-	}
 
 	var highest = 1;
 	$.fn.bringToTop = function() {
@@ -262,4 +249,34 @@ $(function() {
 			.removeClass("active")
 			.end();
 	};
+	
+	function uri(text) {
+		return URI.withinString(text, function(url) {
+			return "<a href='" + url + "' target='_blank'>" + url + "</a>";
+		});
+	}
+	
+	function escape(string) {
+		var e = {
+			"<": "&lt;",
+			">": "&gt;",
+		};
+		return string.replace(/[<>]/g, function (s) {
+			return e[s];
+		});
+	}
+	
+	Handlebars.registerHelper(
+		"uri",
+		function(text) {
+			return uri(escape(text));
+		}
+	);
+	
+	Handlebars.registerHelper(
+		"partial",
+		function(id) {
+			return new Handlebars.SafeString(render(id, this));
+		}
+	);
 });