Merge branch 'url-detection' into dev

Algy · May 10, 2012 · 1d0128b · 1d0128b
2 parents b3992eb + e5d83e9
commit 1d0128b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/static/js/sirc.js b/static/js/sirc.js
@@ -20,7 +20,7 @@ var add_process = function(xml, flag) {
 };
 
 var append_log = function(flag, datetime, source, message) {
-	var element = $('<li><div class="datetime">' + datetime_format(datetime) + '</div><div class="source">&lt;<span class="nick">' + html_encode(source) + '</span>&gt;</div><div class="message">' + html_encode(message) + '</div></li>');
+	var element = $('<li><div class="datetime">' + datetime_format(datetime) + '</div><div class="source">&lt;<span class="nick">' + html_encode(source) + '</span>&gt;</div><div class="message">' + url_detection(html_encode(message)) + '</div></li>');
 	if(flag == 'downdate') {
 		element.prependTo($('ul#log'));
 		last_downdate = datetime;
@@ -60,6 +60,11 @@ var trim = function(str){
 	return str.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
 };
 
+var URL_PATTERN = /((https?|ftp):\/\/)(([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)|localhost|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.(com|net|org|info|biz|gov|name|edu|[a-zA-Z][a-zA-Z]))(:[0-9]+)?((\/|\?)[^ "]*[^ ,;\.:">)])?/g; // from dputty
+var url_detection = function(str) {
+	return str.replace(URL_PATTERN, '<a href="' + '$&' + '" target="_blank">' + '$&' + '</a>');
+};
+
 // Ajax Calls
 
 var sirc_update = function() {