summaryrefslogtreecommitdiff
path: root/frontend/static
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2017-10-20 15:30:28 +0200
committerJules Laplace <julescarbon@gmail.com>2017-10-20 15:30:28 +0200
commita3e75d342e3b58ddfed5188483f25c24118920ce (patch)
treee034c4e0b8111b4e837fc89859f097b162e558e3 /frontend/static
parent9b29c005a473b3364d031e5f98a71c170bd3282f (diff)
build
Diffstat (limited to 'frontend/static')
-rwxr-xr-xfrontend/static/js/sj_compiled.js16
1 files changed, 4 insertions, 12 deletions
diff --git a/frontend/static/js/sj_compiled.js b/frontend/static/js/sj_compiled.js
index 32ded05..a21c452 100755
--- a/frontend/static/js/sj_compiled.js
+++ b/frontend/static/js/sj_compiled.js
@@ -1513,7 +1513,7 @@ var Playlist =
// block video if it's a duplicate
}
var url = row[4]
- if (url.indexOf("youtube.com") !== -1 || url.indexOf("youtu.be") !== -1)
+ if (url.indexOf("youtube.com") !== -1)
{
var ytid = Youtube.getYtid(url)
video.type = "youtube"
@@ -1979,15 +1979,6 @@ var Youtube =
height: "100%",
getYtid: function (url)
{
- if (url.indexOf("youtu.be")){
- var reg = /youtu\.be\/([A-Za-z0-9]+)/
- var matches = reg.exec(url)
- if (matches){
- console.log(matches[1])
- return matches[1]
- }
-
- }
if (! url) return
var ytid = url.substr(url.indexOf("v=")+2,11)
if (ytid.indexOf("&") !== -1)
@@ -2540,7 +2531,7 @@ var Chat =
var word = words[i]
if (word.indexOf("http") !== -1)
{
- if (word.indexOf("youtube.com/watch?") !== -1 || word.indexOf("youtu.be") !== -1 )
+ if (word.indexOf("youtube.com/watch?") !== -1)
{
var ytid = "youtube_"+Youtube.getYtid(word)
var txt
@@ -3379,7 +3370,8 @@ var Keyboard =
Player.playPrev()
else if (kc === 39 || kc === 176)
Player.playNext()
- if (! Keyboardndow).bind("resize", Viewport.standardResize)
+ if (! Keyboard)
+ $(window).bind("resize", Viewport.standardResize)
$("#chat").bind("mouseover", Viewport.chatMouseOver)
$("#chat").bind("mouseout", Viewport.chatMouseLaave)
$("#bg,#logo,#logobg,#form,#formbg,#chat,#chatbg,#playlist,#playlistbg,#lastlogbox,#lastlogbg,#sitez,#controls").show()