diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-07-16 15:29:10 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-07-16 15:29:10 -0400 |
| commit | e17d458b644fddccd522d0475f531b487c4d95ef (patch) | |
| tree | 7e9e1fdd8913093ca2b2d8f73ea8290c6b8105d3 /public/assets/javascripts/mx | |
| parent | 5a5dc68dd2f9ae198864d7f25b4c9840dbe14d77 (diff) | |
some bugfixes.. info window for builder
Diffstat (limited to 'public/assets/javascripts/mx')
| -rw-r--r-- | public/assets/javascripts/mx/primitives/mx.video.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/mx/primitives/mx.vimeo.js | 10 | ||||
| -rw-r--r-- | public/assets/javascripts/mx/primitives/mx.youtube.js | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.video.js b/public/assets/javascripts/mx/primitives/mx.video.js index 7f91e34..b28204d 100644 --- a/public/assets/javascripts/mx/primitives/mx.video.js +++ b/public/assets/javascripts/mx/primitives/mx.video.js @@ -20,7 +20,7 @@ MX.Video = 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() }, 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() } diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js index 8c11da6..47d5507 100644 --- a/public/assets/javascripts/mx/primitives/mx.youtube.js +++ b/public/assets/javascripts/mx/primitives/mx.youtube.js @@ -20,7 +20,7 @@ MX.Youtube = 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() }, |