diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-05 18:13:59 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-05 18:13:59 -0500 |
| commit | 22c4fd94cd4b3f5f881f0ad91597b7c208e89eff (patch) | |
| tree | 910f9273c2de0c49b77e411b1c0a6cf5efd8c108 /public/assets/javascripts/mx/primitives/mx.video.js | |
| parent | 64748a6d55f1e4d08270367767b631b724833b19 (diff) | |
| parent | 69cf6a5005dcd0e7fcebcc1db9bd290b5fb63ed1 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/mx/primitives/mx.video.js')
| -rw-r--r-- | public/assets/javascripts/mx/primitives/mx.video.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.video.js b/public/assets/javascripts/mx/primitives/mx.video.js index 12d3dcb..333e1d2 100644 --- a/public/assets/javascripts/mx/primitives/mx.video.js +++ b/public/assets/javascripts/mx/primitives/mx.video.js @@ -45,6 +45,9 @@ MX.Video = MX.Object3D.extend({ if (this.media.mute) { this.mute() } + else { + this.unmute() + } if (this.media.autoplay) { this.play() @@ -74,11 +77,13 @@ MX.Video = MX.Object3D.extend({ mute: function(){ this.player.muted = true + this.player.volume = 0 this.muted = true }, unmute: function(){ this.player.muted = false + this.player.volume = 0.8 this.muted = false }, |