Fix issue where making links clickable conflicted with formatting codes

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index c7f563e796a0c6ddd85bf8fe77c4557f78139f74..cd5f861a5628f81729dee05da27b4ac21c64883c 100644 (file)
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -12,6 +12,7 @@ html, body { height:100%; }
 #kiwi p { margin:0.5em 0; }
 #kiwi a { color:#36C; text-decoration:none; cursor:pointer; }
 #kiwi a img { border:none; }
+#kiwi .formatSpan a { color: inherit; background-color: inherit; text-decoration: inherit; font-style: inherit; font-weight: inherit;}
 
 
 /**

diff --git a/client/assets/dev/utils.js b/client/assets/dev/utils.js
index 9dc7e369253d263c359d89dc8957b24b79c12ce5..0e21a33b1972e16e010e4f2f2a88bdea9c0cf6cb 100644 (file)
--- a/client/assets/dev/utils.js
+++ b/client/assets/dev/utils.js
@@ -285,7 +285,7 @@ function formatIRCMsg (msg) {
                     colours = openTags.colour.split(',');
                     style += 'color: ' + colours[0] + ((colours[1]) ? '; background-color: ' + colours[1] + ';' : '');
                 }
-                return '<span style="' + style + '">';
+                return '<span class="formatSpan" style="' + style + '">';
             }
         },
         colourMatch = function (str) {

diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index afe4d35d783cfe079e1e47882de3a00a078d8b47..7d60728fbf265bda31b3b76d60727b94e971dd43 100644 (file)
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -457,7 +457,7 @@ _kiwi.view.Panel = Backbone.View.extend({
 \r
 \r
         // Parse any links found\r
-        msg.msg = msg.msg.replace(/(([A-Za-z0-9\-]+\:\/\/)|(www\.))([\w.\-]+)([a-zA-Z]{2,6})(:[0-9]+)?(\/[\w#!:.?$'()[\]*,;~+=&%@!\-\/]*)?/gi, function (url) {\r
+        msg.msg = msg.msg.replace(/(([A-Za-z][A-Za-z0-9\-]*\:\/\/)|(www\.))([\w.\-]+)([a-zA-Z]{2,6})(:[0-9]+)?(\/[\w#!:.?$'()[\]*,;~+=&%@!\-\/]*)?/gi, function (url) {\r
             var nice = url,\r
                 extra_html = '';\r
 \r