summaryrefslogtreecommitdiff
path: root/frontend/static/js
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/static/js')
-rwxr-xr-xfrontend/static/js/avatar.js6
-rw-r--r--frontend/static/js/src/chat.js2
2 files changed, 4 insertions, 4 deletions
diff --git a/frontend/static/js/avatar.js b/frontend/static/js/avatar.js
index a175bb2..3caab25 100755
--- a/frontend/static/js/avatar.js
+++ b/frontend/static/js/avatar.js
@@ -86,8 +86,8 @@ Chat.say = function ()
// $("#chat").append(newdiv)
// if (newdiv.indexOf("<img") !== -1)
// setTimeout('d.scrollToBottom("#chat")', 2000)
- if (msg.indexOf("scannerjammer.com/avatar") === -1)
- msg = "http://scannerjammer.com/avatar/" + d.choice(AVATARS) + " " + msg
+ if (msg.indexOf("scannerjammer.com/static/avatar") === -1)
+ msg = "http://scannerjammer.com/static/avatar/" + d.choice(AVATARS) + " " + msg
$.post(API.URL.room.say, {room: Room.name, session: Auth.session, msg: msg}, Room.sayCallback)
d.scrollToBottom("#chat")
}
@@ -105,7 +105,7 @@ Chat.parseWords = function (raw)
var word = words[i]
if (word.indexOf("http") !== -1)
{
- if (word.indexOf("scannerjammer.com/avatar") !== -1)
+ if (word.indexOf("scannerjammer.com/static/avatar") !== -1)
{
avatar = word
}
diff --git a/frontend/static/js/src/chat.js b/frontend/static/js/src/chat.js
index 324678b..31892cc 100644
--- a/frontend/static/js/src/chat.js
+++ b/frontend/static/js/src/chat.js
@@ -50,7 +50,7 @@ var Chat =
txt = word
s += '<a href="'+word+'" class="ytlink" id="'+ytid+'" target="_parent">'+txt+'</a> '
}
- else if (word.replace("https", "http").indexOf("youtu.be") !== -1)
+ else if (word.indexOf("youtu.be") !== -1)
{
var ytid = "youtube_"+word.substr(16,11)
var txt