diff options
| author | Scott Ostler <sostler@deathmachine.local> | 2010-03-26 16:11:50 -0400 |
|---|---|---|
| committer | Scott Ostler <sostler@deathmachine.local> | 2010-03-26 16:11:50 -0400 |
| commit | b3dcf20f4428882d23af2de0790c9248a59cc39c (patch) | |
| tree | cbc8958d7da6cbdbb8f4db36ea96b560282a3e3a /static/js | |
| parent | b66a1d52c276b5599605621b91922745a48ca6d7 (diff) | |
| parent | 72a35872990d8c5d322eedf2dedb87b5d67e1aae (diff) | |
Merged src/site.clj TODO conflict
Diffstat (limited to 'static/js')
| -rwxr-xr-x | static/js/pichat.js | 8 | ||||
| -rwxr-xr-x | static/js/register.js | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/static/js/pichat.js b/static/js/pichat.js index 4c91a35..2158d89 100755 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -26,8 +26,12 @@ var LastMsgContainsImage = false function linkReplace(url){ var PicRegex = /\.(jpg|jpeg|png|gif|bmp)$/i; var urlWithoutParams = url.replace(/\?.*$/i, ""); - linkUrl = url.indexOf('http://') == 0 ? url : 'http://' + url; - + + if (url.indexOf('http://') == 0 || url.indexOf('https://') == 0 || url.indexOf('ftp://') == 0) + linkUrl = url; + else + linkUrl = 'http://' + url; + if (PicRegex.test(urlWithoutParams)){ LastMsgContainsImage = true return "<a target='_blank' href='" + linkUrl + "'><img src='" + linkUrl + "'></a>" diff --git a/static/js/register.js b/static/js/register.js index d479aab..c87eadc 100755 --- a/static/js/register.js +++ b/static/js/register.js @@ -6,7 +6,7 @@ function validateNick(n) { // HOPE NO HACKERS ARE READING THIS :o var ValidCodes = ['WAXWANYE23', - 'HOTDUMPING5000','RHIZOME','VIP666','HEATNAP',]; + 'HOTDUMPING5000','RHIZOME','VIP666','HEATNAP','anamanaguchi',]; function submitRegistration() { var nick = $('#nickInput').val(); |