merge

3 files changed, 24 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 873348f..3f342a1 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -34,9 +34,22 @@ MX.Youtube = MX.Object3D.extend({
   	preload.style.width = this.media.width + "px"
   	preload.style.height = this.media.height + "px"
   	preload.style.pointerEvents = "none"
+  	preload.style.position = "absolute"
+  	preload.style.top = "0"
+  	preload.style.left = "0"
+  	preload.style.zIndex = "1"
   	preload.className = "preload"
   	this.el.appendChild(preload)
   	
+  	var overlay = this.overlay = document.createElement("div")
+  	overlay.style.width = "100%"
+  	overlay.style.height = "100%"
+  	overlay.style.position = "absolute"
+  	overlay.style.top = "0"
+  	overlay.style.left = "0"
+  	overlay.style.zIndex = "2"
+  	overlay.className = "overlay"
+  	this.el.appendChild(overlay)
   	this.defer(uid)
   },
   
@@ -96,6 +109,9 @@ MX.Youtube = MX.Object3D.extend({
 		if (this.media.mute) {
 			this.mute()
 		}
+		else {
+      this.unmute()
+		}
 
 		this.seek( this.media.keyframe || 0 )
   },