summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/mx
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/mx')
-rw-r--r--public/assets/javascripts/mx/primitives/mx.video.js9
-rw-r--r--public/assets/javascripts/mx/primitives/mx.vimeo.js3
-rw-r--r--public/assets/javascripts/mx/primitives/mx.youtube.js3
3 files changed, 13 insertions, 2 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.video.js b/public/assets/javascripts/mx/primitives/mx.video.js
index f750c28..b1b9f6b 100644
--- a/public/assets/javascripts/mx/primitives/mx.video.js
+++ b/public/assets/javascripts/mx/primitives/mx.video.js
@@ -19,11 +19,14 @@ MX.Video = MX.Object3D.extend({
ops.className && this.el.classList.add(ops.className)
this.backface && this.el.classList.add("backface-visible")
this.el.classList.add("video")
+ this.paused = true
this.load()
},
load: function(ops){
+ this.paused = true
+
this.player = document.createElement('video')
this.player.addEventListener("loadedmetadata", $.proxy(this.ready, this))
this.player.addEventListener("error", $.proxy(this.error, this))
@@ -37,7 +40,7 @@ MX.Video = MX.Object3D.extend({
ready: function(){
if (this.media.autoplay) {
- this.player.play()
+ this.play()
}
else {
this.player.currentTime = this.player.duration / 3
@@ -49,14 +52,16 @@ MX.Video = MX.Object3D.extend({
},
play: function(){
+ this.paused = false
this.player.play()
},
pause: function(){
+ this.paused = true
this.player.pause()
},
- seek: function(n){
+ seek: function(n){
this.player.currentTime = n
},
diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index 994c835..e558bc3 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -19,6 +19,7 @@ MX.Vimeo = MX.Object3D.extend({
ops.className && this.el.classList.add(ops.className)
this.backface && this.el.classList.add("backface-visible")
this.el.classList.add("video")
+ this.paused = true
this.load()
},
@@ -57,10 +58,12 @@ MX.Vimeo = MX.Object3D.extend({
},
play: function(){
+ this.paused = false
this.player.api('play')
},
pause: function(){
+ this.paused = true
this.player.api('pause')
},
diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index 118623b..cc0ec0a 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -19,6 +19,7 @@ MX.Youtube = MX.Object3D.extend({
ops.className && this.el.classList.add(ops.className)
this.backface && this.el.classList.add("backface-visible")
this.el.classList.add("video")
+ this.paused = true
this.load()
},
@@ -92,8 +93,10 @@ MX.Youtube = MX.Object3D.extend({
this.finished()
break
case 1: // play
+ this.paused = false
break
case 2: // pause
+ this.paused = true
break
case 3: // buffering
break