From 1826bed806b079c6e44703a4e5f424b7aed7bd96 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 11 Jul 2014 17:29:41 -0400 Subject: play button --- .../javascripts/rectangles/engine/scenery/types/video.js | 3 --- .../javascripts/rectangles/engine/scenery/types/vimeo.js | 14 +++++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'public/assets/javascripts/rectangles/engine/scenery') diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js index 2f6dc01..a9fce4a 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js +++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js @@ -15,10 +15,7 @@ Scenery.types.video = Scenery.types.base.extend(function(base){ build: function(){ this.mx = new MX.Video({ - src: this.media.url, media: this.media, - width: this.media.width, - height: this.media.height, scale: this.scale, y: this.scale * this.media.height/2, backface: false, diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/vimeo.js b/public/assets/javascripts/rectangles/engine/scenery/types/vimeo.js index 697c66a..ded5f87 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/types/vimeo.js +++ b/public/assets/javascripts/rectangles/engine/scenery/types/vimeo.js @@ -22,7 +22,19 @@ Scenery.types.vimeo = Scenery.types.base.extend(function(base){ }) scene.add( this.mx ) }, - + + play: function(){ + this.mx.play() + }, + + pause: function(){ + this.mx.pause() + }, + + seek: function(n){ + this.mx.seek(n) + }, + serialize: function(){ var data = base.serialize.call(this) return data -- cgit v1.2.3-70-g09d2