From 20e8fc1b023fd14815e670fded93f91d2eeb9278 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Oct 2017 12:21:49 -0400 Subject: agh ok --- frontend/static/js/sj_compiled.js | 9 ++-- frontend/static/js/src/froogaloop.js | 2 +- frontend/static/js/src/vimeo.js | 6 ++- 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 @@
+ About
@@ -68,7 +70,85 @@ -- cgit v1.2.3-70-g09d2