summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/mx/primitives/mx.vimeo.js
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/mx/primitives/mx.vimeo.js')
-rw-r--r--public/assets/javascripts/mx/primitives/mx.vimeo.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index 0301e64..7a5327e 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -20,7 +20,7 @@ MX.Vimeo = MX.Object3D.extend({
this.backface && this.el.classList.add("backface-visible")
this.el.classList.add("video")
this.paused = !! this.media.autoplay
- this.muted = !! this.media.mute
+ this.muted = app.muted || !! this.media.mute
this.load()
},
@@ -82,6 +82,14 @@ MX.Vimeo = MX.Object3D.extend({
},
seek: function(n){
+ // defer seek until we have duration
+ if (! this.duration()) {
+ setTimeout(function(){
+ this.seek(n)
+ }.bind(this), 300)
+ return
+ }
+
if (n < 1) {
n = n * this.duration()
}