From afcb492f8b32b9146e160fbfa0ea1e4691463568 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sun, 28 Apr 2013 12:41:50 -0400 Subject: Get video from Parse and add to DOM --- TODO | 8 ++++---- public/javascripts/app.js | 2 +- public/stylesheets/style.css | 2 +- views/index.ejs | 4 +++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/TODO b/TODO index fd079c5..88040af 100644 --- a/TODO +++ b/TODO @@ -2,12 +2,12 @@ TODO ==== v Get characters and images from the TMS API in my character-images.js route -- Get video - - Connect to Parse API +v Get video + v Connect to Parse API - Timer -- Select a character +v Select a character - Points in Viggle v Push to Heroku -- Change Coverflow library +v Change Coverflow library - Make Leaderboard page - Make Rules page diff --git a/public/javascripts/app.js b/public/javascripts/app.js index 9bd769b..aa57543 100644 --- a/public/javascripts/app.js +++ b/public/javascripts/app.js @@ -28,7 +28,7 @@ var App = App || null; }; this.initialize_video = function(url) { - console.log(url); + $('section.video video').attr('src', url); }; this.get_characters = function(series_id, params) { diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index bb3ac3a..263452e 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -9,7 +9,7 @@ section.video { z-index: 15; } -section.video iframe { +section.video video { position: absolute; top: 0; left: 0; diff --git a/views/index.ejs b/views/index.ejs index 4b800e5..4438a2d 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -22,7 +22,9 @@

- +

-- cgit v1.2.3