diff options
Diffstat (limited to 'pages/chat.php')
| -rw-r--r-- | pages/chat.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pages/chat.php b/pages/chat.php index 4a14a8d..f55476f 100644 --- a/pages/chat.php +++ b/pages/chat.php @@ -177,11 +177,12 @@ 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 # in the URL with %23
+ //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'");
chat = chat.replace(/<a href='redirect\?to=(.*?)(&)(.*?)' target='_blank'/ig, "<a href='redirect?to=$1%26$3' target='_blank'");
+ chat = chat.replace(/<a href='redirect\?to=(.*?)(\?)(.*?)' target='_blank'/ig, "<a href='redirect?to=$1%3F$3' target='_blank'");
//Making the bet that not all browsers do the same:
chat = chat.replace(/<a href='redirect\?to=(.*?)(&)(.*?)' target='_blank'/ig, "<a href='redirect?to=$1%26$3' target='_blank'");
@@ -284,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
|