diff options
| author | Teddy Wing | 2013-04-28 12:41:50 -0400 |
|---|---|---|
| committer | Teddy Wing | 2013-04-28 12:41:50 -0400 |
| commit | afcb492f8b32b9146e160fbfa0ea1e4691463568 (patch) | |
| tree | 28a9d8b86ca246259104e7ab9ebab3fdd346678b | |
| parent | 9abf6afec1beaaa137090aec42c6a133b2e47b6e (diff) | |
| download | Who-am-I-afcb492f8b32b9146e160fbfa0ea1e4691463568.tar.bz2 | |
Get video from Parse and add to DOM
| -rw-r--r-- | TODO | 8 | ||||
| -rw-r--r-- | public/javascripts/app.js | 2 | ||||
| -rw-r--r-- | public/stylesheets/style.css | 2 | ||||
| -rw-r--r-- | views/index.ejs | 4 |
4 files changed, 9 insertions, 7 deletions
@@ -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 @@ <body> <div role="main"> <section class="video"> - <iframe width="680" height="360" src="http://www.youtube.com/embed/Yj1TXR68BPA" frameborder="0" allowfullscreen></iframe> + <video src="" controls> + Your browser does not support the <code>video</code> element. + </video> </section> <section id="character-select"> |