summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-11-05 12:39:16 -0500
committerJules Laplace <jules@okfoc.us>2014-11-05 12:39:16 -0500
commit38721a909cf2fe2e809f08445c94321d8635c1c9 (patch)
tree17962e29c3216cffc2c9ef4c99c500c339916210
parent4adaca22b5cafba9dcfd8fd147d44797ad267a77 (diff)
make video default at full volume and play from beginning
-rw-r--r--public/assets/javascripts/mx/primitives/mx.video.js5
-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, 11 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
},
diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index 4922519..e71b105 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -62,6 +62,9 @@ MX.Vimeo = MX.Object3D.extend({
if (this.media.mute) {
this.mute()
}
+ else {
+ this.unmute()
+ }
this.seek( this.media.keyframe || 0 )
diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index 8511173..3f342a1 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -109,6 +109,9 @@ MX.Youtube = MX.Object3D.extend({
if (this.media.mute) {
this.mute()
}
+ else {
+ this.unmute()
+ }
this.seek( this.media.keyframe || 0 )
},