merge

1 files changed, 26 insertions, 2 deletions

diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index 873348f..8cd9f59 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -21,6 +21,7 @@ MX.Youtube = MX.Object3D.extend({
 		this.el.classList.add("video")
 		this.el.classList.add("mx-scenery")
   	this.paused = !! this.media.autoplay
+  	this.playing = false
 		this.muted = app.muted || !! this.media.mute
   },
 
@@ -31,12 +32,25 @@ MX.Youtube = MX.Object3D.extend({
   	preload.id = uid
   	preload.style.backgroundImage = "url(" + this.media.thumbnail + ")"
   	preload.style.backgroundSize = "cover"
-  	preload.style.width = this.media.width + "px"
-  	preload.style.height = this.media.height + "px"
+  	preload.style.width = "100%"
+  	preload.style.height = "100%"
   	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 +110,9 @@ MX.Youtube = MX.Object3D.extend({
 		if (this.media.mute) {
 			this.mute()
 		}
+		else {
+      this.unmute()
+		}
 
 		this.seek( this.media.keyframe || 0 )
   },
@@ -127,11 +144,13 @@ MX.Youtube = MX.Object3D.extend({
   
   play: function(){
 		this.paused = false
+  	this.playing = true
   	this.player.playVideo()
   },
   
   pause: function(){
 		this.paused = true
+  	this.playing = false
 		this.player.pauseVideo()
   },
   
@@ -157,6 +176,11 @@ MX.Youtube = MX.Object3D.extend({
 		this.player.setVolume(80)
   	this.muted = false
   },
+
+  setVolume: function(n){
+    if (this.muted || ! this.player || ! this.player.setVolume) return
+    this.player.setVolume( floor(n * 100) )
+  },
   
   setLoop: function(state){
 		this.media.loop = state