diff options
| author | ryderr <r@okfoc.us> | 2014-10-24 16:43:36 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-24 16:43:36 -0400 |
| commit | bd668cf8f54c6ab0c5aa52b7dacf603abadac168 (patch) | |
| tree | 358bb4b75ae147015a529be5d61cea2062b6c7af | |
| parent | 00880f3965408ba94be1d6c5580eff0307f25085 (diff) | |
| parent | ee834da028053b18cf64b031022337fe78a717a3 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
| -rw-r--r-- | public/assets/javascripts/app.js | 24 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/site/HomeView.js | 24 |
2 files changed, 23 insertions, 25 deletions
diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js index 028ebb8..fddbd5a 100644 --- a/public/assets/javascripts/app.js +++ b/public/assets/javascripts/app.js @@ -17,30 +17,6 @@ else { new WOW().init(); -$(function(){ - var player = $f( okplayer ) - player.addEvent('ready', function(){ - player.addEvent('finish', function(){ - hide() - }) - }) - $('.hero .circle').click( function(){ - $('.videoModal').css("display","table").addClass('active'); - player.api('play') - }) - - $('.videoModal .ion-ios7-close-empty').click( function(){ - player.api('pause') - hide() - }) - - function hide() { - $('.videoModal').fadeOut(300, function(){ - $('.videoModal').removeClass('active') - }) - } -}) - var scene, cam, map; var app = new function(){} diff --git a/public/assets/javascripts/ui/site/HomeView.js b/public/assets/javascripts/ui/site/HomeView.js index 02f9ab9..ba2ead3 100644 --- a/public/assets/javascripts/ui/site/HomeView.js +++ b/public/assets/javascripts/ui/site/HomeView.js @@ -6,6 +6,28 @@ var HomeView = View.extend({ load: function() { this.projectList = new ProjectList () - } + + var player = $f( okplayer ) + player.addEvent('ready', function(){ + player.addEvent('finish', function(){ + hide() + }) + }) + $('.hero .circle').click( function(){ + $('.videoModal').css("display","table").addClass('active'); + player.api('play') + }) + + $('.videoModal .ion-ios7-close-empty').click( function(){ + player.api('pause') + hide() + }) + + function hide() { + $('.videoModal').fadeOut(300, function(){ + $('.videoModal').removeClass('active') + }) + } + }, }) |