summaryrefslogtreecommitdiffstats
path: root/pages/chat.php
diff options
context:
space:
mode:
authorBlueRaja <BlueRaja.admin@gmail.com>2013-06-08 15:14:57 -0500
committerBlueRaja <BlueRaja.admin@gmail.com>2013-06-08 15:14:57 -0500
commit3a65ace8a32fa2c584adee4e75a0eccc9ee37208 (patch)
tree9d569f3779609eb232ee19f99e3cd65dd0b69d54 /pages/chat.php
parentf4d221abc57c35a66e8e2c616f1029f86dec1f8e (diff)
downloadpathery-3a65ace8a32fa2c584adee4e75a0eccc9ee37208.tar.xz
BUGFIX: Clicking on links in chat is broken
Diffstat (limited to 'pages/chat.php')
-rw-r--r--pages/chat.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/pages/chat.php b/pages/chat.php
index a285d7d..f55476f 100644
--- a/pages/chat.php
+++ b/pages/chat.php
@@ -177,7 +177,7 @@ function chatReplaceAndEncode(chat) {
//Surround all URLs with a <a> link
var URLexp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
- chat = chat.replace(URLexp, "<a href='redirect?to=$1' target='_blank' onclick='return doNothingWhenClickingLinks();'>$1</a>");
+ chat = chat.replace(URLexp, "<a href='redirect?to=$1' target='_blank' onclick='return doNothingWhenClickingLinks(this);'>$1</a>");
//Replace # with %23, & with %26, ? with %3F
chat = chat.replace(/<a href='redirect\?to=(.*?)(#)(.*?)' target='_blank'/ig, "<a href='redirect?to=$1%23$3' target='_blank'");
@@ -285,9 +285,9 @@ function htmlEncode(value){
}
}
-function doNothingWhenClickingLinks()
+function doNothingWhenClickingLinks(self)
{
- return false;
+ return !$(self).closest('.spoiler').length;
}
//Code for checking if the window is currently visible or not