diff options
Diffstat (limited to 'frontend')
| -rwxr-xr-x | frontend/static/js/sj_compiled.js | 9 | ||||
| -rw-r--r-- | frontend/static/js/src/froogaloop.js | 2 | ||||
| -rw-r--r-- | frontend/static/js/src/vimeo.js | 6 | ||||
| -rwxr-xr-x | frontend/templates/roomlist.html | 82 |
4 files changed, 92 insertions, 7 deletions
diff --git a/frontend/static/js/sj_compiled.js b/frontend/static/js/sj_compiled.js index d2c915c..f966aa5 100755 --- a/frontend/static/js/sj_compiled.js +++ b/frontend/static/js/sj_compiled.js @@ -567,7 +567,8 @@ var Froogaloop = (function(){ // Expose froogaloop to the global object return (window.Froogaloop = window.$f = Froogaloop); -})();var d = +})(); +var d = { DEBUG: true, act: function (s) @@ -1675,6 +1676,7 @@ var Vimeo = play: function (video) { d.warn("VIMEO PLAY "+video.key) + return Vimeo.error() if (video.error) return Vimeo.error() if (Vimeo.playing) @@ -1683,10 +1685,11 @@ var Vimeo = Vimeo.video = video Vimeo.playing = true + var uid = 'vimeoembed' var preload = document.createElement("iframe") preload.id = uid - preload.setAttribute("src", "//player.vimeo.com/video/" + this.media.token + "?api=1&badge=0&controls=0branding=0&byline=0&portrait=0&title=0&" + loop + "&player_id=" + uid) - preload.style.backgroundImage = "url(" + this.media.thumbnail + ")" + preload.setAttribute("src", "//player.vimeo.com/video/" + this.media.token + "?api=1&badge=0&controls=0branding=0&byline=0&portrait=0&title=0&&player_id=" + uid) + // preload.style.backgroundImage = "url(" + this.media.thumbnail + ")" preload.style.width = "100%" preload.style.height = "100%" preload.style.border = "0" diff --git a/frontend/static/js/src/froogaloop.js b/frontend/static/js/src/froogaloop.js index c9330e6..8a6eca2 100644 --- a/frontend/static/js/src/froogaloop.js +++ b/frontend/static/js/src/froogaloop.js @@ -284,4 +284,4 @@ var Froogaloop = (function(){ // Expose froogaloop to the global object return (window.Froogaloop = window.$f = Froogaloop); -})();
\ No newline at end of file +})(); diff --git a/frontend/static/js/src/vimeo.js b/frontend/static/js/src/vimeo.js index 7157f26..f10ed55 100644 --- a/frontend/static/js/src/vimeo.js +++ b/frontend/static/js/src/vimeo.js @@ -14,6 +14,7 @@ var Vimeo = play: function (video) { d.warn("VIMEO PLAY "+video.key) + return Vimeo.error() if (video.error) return Vimeo.error() if (Vimeo.playing) @@ -22,10 +23,11 @@ var Vimeo = Vimeo.video = video Vimeo.playing = true + var uid = 'vimeoembed' var preload = document.createElement("iframe") preload.id = uid - preload.setAttribute("src", "//player.vimeo.com/video/" + this.media.token + "?api=1&badge=0&controls=0branding=0&byline=0&portrait=0&title=0&" + loop + "&player_id=" + uid) - preload.style.backgroundImage = "url(" + this.media.thumbnail + ")" + preload.setAttribute("src", "//player.vimeo.com/video/" + this.media.token + "?api=1&badge=0&controls=0branding=0&byline=0&portrait=0&title=0&&player_id=" + uid) + // preload.style.backgroundImage = "url(" + this.media.thumbnail + ")" preload.style.width = "100%" preload.style.height = "100%" preload.style.border = "0" diff --git a/frontend/templates/roomlist.html b/frontend/templates/roomlist.html index e0fb255..8b5fd25 100755 --- a/frontend/templates/roomlist.html +++ b/frontend/templates/roomlist.html @@ -49,8 +49,10 @@ <div id="sitez"> <div> + <!-- <a href="/top/">Top Videos Today</a> . <a href="/directory/">Directory</a> . + --> <a href="/faq/">About</a> </div> <div id="likebutton"> @@ -68,7 +70,85 @@ <script type="text/javascript"> var serverHost = "{{SERVER_HOST}}"; var serverPort = 80; - var ROOM_LIST = {{ROOM_LIST|safe}}; + var ROOM_LIST = [ + [ + 8, + "main", + 1299078119, + 6, + "http://i.asdf.us/im/1a/LrsVg_1316796094_1316796107_1316796117.gif" + ], + [ + 11, + "jonomilo", + 1301625372, + 0, + "http://78.media.tumblr.com/tumblr_lg5er2koh61qbfw82o1_500.png", + ], + [ + 12, + "waterfall", + 1301640884, + 0, + "http://i.imgur.com/LMPE4Pr.gif" + ], + [ + 15, + "glitter", + 1302659603, + 0, + "http://scannerjammer.com/static/bgz/argus.gif" + ], + [ + 16, + "avatar", + 1302659607, + 0, + "http://scannerjammer.com/static/bgz/lavender.jpg" + ], + [ + 50, + "diornights", + 1309508265, + 0, + "http://i.asdf.us/im/ec/satan1_1351567550_1351567558.gif" + ], + [ + 51, + "sports", + 1354918731, + 0, + "http://i.asdf.us/im/f1/3yaxxiFPbGenerate_14-PbGrid_1444784255_pepper.png", + ], + [ + 71, + "classical", + 1315289184, + 3, + "http://asdf.us/im/9d/siena_cathedral04_1317803436_pepper.gif" + ], + [ + 72, + "icons", + 1317164383, + 0, + "http://i.asdf.us/im/87/1437241790829-ascii-bamboo.png" + ], + [ + 78, + "nightschool", + 1318498390, + 0, + "http://i.asdf.us/im/83/_1385420141_jules.gif" + ], + [ + 98, + "oldamerica", + 1348991910, + 0, + "http://i.asdf.us/im/9f/imgrid_1343101569_xx_abridged___pepper.png" + ] +]; </script> <script type="text/javascript">if (navigator.userAgent.indexOf("MSIE") !== -1) { document.getElementById("lunacy").style.display="block" }</script> <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery-1.5.2.min.js"></script> |