diff options
| author | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2015-02-21 17:31:52 -0500 |
|---|---|---|
| committer | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2015-02-21 17:31:52 -0500 |
| commit | c928e3ea505a32badee23b8883727ad45ad62a53 (patch) | |
| tree | 08bc3d29261925b44ddaaf1009cdf81ddf4fcf93 | |
| parent | c8bd3b66365c25fef2114c904ebf75ea58f2ef68 (diff) | |
wav files should not autoplay
| -rw-r--r-- | static/js/pichat.js | 12 | ||||
| -rwxr-xr-x | static/js/register.js | 2 | ||||
| -rw-r--r-- | static/js/src/text.js | 6 | ||||
| -rw-r--r-- | template/banner.st | 3 |
4 files changed, 12 insertions, 11 deletions
diff --git a/static/js/pichat.js b/static/js/pichat.js index c897d91..488aa88 100644 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -2213,8 +2213,10 @@ function linkReplace(url) { return "<a target='_blank' class='youtube' href='" + linkUrl + "'>" + "<img class='youtube-thumb' width='130' height='97' src='"+Youtube.nextThumbUrl(uri.queryKey.v)+"'>" + "<img class='youtube-controls' src='/static/img/youtube.controls.png'></a>" - } else if (type == 'midi' || type == 'wav') { - return '<embed src="'+linkUrl+'" loop="false" autostart="false" volume="80" width="150" height="20" style="vertical-align:bottom"> <a href="'+linkUrl+'">'+uri.file+'</a>' + } else if (type == 'midi') { + return '<embed src="'+linkUrl+'" autostart="false" loop="false" volume="80" width="150" height="20" style="vertical-align:bottom"> <a href="'+linkUrl+'">'+uri.file+'</a>' + } else if (type == 'wav') { + return '<audio src="'+linkUrl+'" controls volume="80" width="150" height="20" style="vertical-align:bottom"></audio> <a href="'+linkUrl+'">'+uri.file+'</a>' } else return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>"; @@ -2433,9 +2435,3 @@ Youtube = { }, } - - -try { -if (Nick == "aids_enoch" && Room != "elephants") window.location.href ="http://elephants.dump.fm/" -} -catch(e){} diff --git a/static/js/register.js b/static/js/register.js index 4352c19..91377e4 100755 --- a/static/js/register.js +++ b/static/js/register.js @@ -74,7 +74,7 @@ function hasLocalStorage() { function initRegister() { var date = new Date () - var open_reg = false || ! ('LoggedIn' in window) + var open_reg = true || ! ('LoggedIn' in window) if (hasLocalStorage() && localStorage.is_banned == "true") { $('.regopen').remove() $('.log-in').remove() diff --git a/static/js/src/text.js b/static/js/src/text.js index 9420ba0..773eed4 100644 --- a/static/js/src/text.js +++ b/static/js/src/text.js @@ -120,8 +120,10 @@ function linkReplace(url) { return "<a target='_blank' class='youtube' href='" + linkUrl + "'>" + "<img class='youtube-thumb' width='130' height='97' src='"+Youtube.nextThumbUrl(uri.queryKey.v)+"'>" + "<img class='youtube-controls' src='/static/img/youtube.controls.png'></a>" - } else if (type == 'midi' || type == 'wav') { - return '<embed src="'+linkUrl+'" loop="false" autostart="false" volume="80" width="150" height="20" style="vertical-align:bottom"> <a href="'+linkUrl+'">'+uri.file+'</a>' + } else if (type == 'midi') { + return '<embed src="'+linkUrl+'" autostart="false" loop="false" volume="80" width="150" height="20" style="vertical-align:bottom"> <a href="'+linkUrl+'">'+uri.file+'</a>' + } else if (type == 'wav') { + return '<audio src="'+linkUrl+'" controls volume="80" width="150" height="20" style="vertical-align:bottom"></audio> <a href="'+linkUrl+'">'+uri.file+'</a>' } else return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>"; diff --git a/template/banner.st b/template/banner.st index 5cca522..b837a42 100644 --- a/template/banner.st +++ b/template/banner.st @@ -76,7 +76,10 @@ $if(user_nick)$ <a href="http://dump.fm/fullscreen">checkout dump.fm in full-screen </a> - <a href="http://abcdef4.dump.fm/">MYSTERY ROOM!!!!!!!! </a> +<!-- - <a href="http://www.zazzle.com/ppshoppe/gifts">CHECK OUT THE PP SHOPPE!!!!!</a> +--> + <a href="https://docs.google.com/forms/d/1b8eHSuRMhTRb58sct0a_C6AdqU3yydE24GBfOelXz5Y/viewform" class='rainbow' style="color: transparent; border-bottom: 1px solid rgba(0,255,255,0.3); font-weight: bold; ">DUMP.FM 5 YEAR PARTY - RSVP TODAY!!!!!</a> $else$ <style>#dumplist{z-index:-1!important;}</style> $endif$ $if(isadmin)$ - <a href="http://vip.dump.fm/">NAUGHTY GIRLS/AND-OR/BOYS DELIGHT </a> $endif$ |
