1 files changed, 38 insertions, 21 deletions
diff --git a/frontend/static/js/src/vimeo.js b/frontend/static/js/src/vimeo.js
index 9680b00..7157f26 100644
--- a/frontend/static/js/src/vimeo.js
+++ b/frontend/static/js/src/vimeo.js
@@ -21,13 +21,33 @@ var Vimeo =
 		$("#screen").html("<div id='vimeo'></div>")
 		Vimeo.video = video
 		Vimeo.playing = true
-		var params = { allowScriptAccess: "always", wmode: "opaque", }
-		var atts = { id: "vimeo" }
-		var flashvars = { api: 1 }
-		swfobject.embedSWF("http://vimeo.com/moogaloop.swf?clip_id="+video.name+"&server=vimeo.com&color=00adef&api=1",
-			"vimeo", "100%","100%", "8", null, flashvars, params, atts)
+
+  	var preload = document.createElement("iframe")
+  	preload.id = uid
+  	preload.setAttribute("src", "//player.vimeo.com/video/" + this.media.token + "?api=1&badge=0&controls=0branding=0&byline=0&portrait=0&title=0&" + loop + "&player_id=" + uid)
+  	preload.style.backgroundImage = "url(" + this.media.thumbnail + ")"
+  	preload.style.width = "100%"
+  	preload.style.height = "100%"
+  	preload.style.border = "0"
+  	preload.style.pointerEvents = "none"
+  	preload.className = "preload"
+  	$("#vimeo").appendChild(preload)
+  	Vimeo.player = $f(preload)
+
+  	Vimeo.player.addEvent('ready', Vimeo.ready)
+
+		//var atts = { id: "vimeo" }
+		//var flashvars = { api: 1 }
+		//swfobject.embedSWF("http://vimeo.com/moogaloop.swf?clip_id="+video.name+"&server=vimeo.com&color=00adef&api=1",
+		//	"vimeo", "100%","100%", "8", null, flashvars, params, atts)
 		// $("#vimeo").html('<iframe src="http://player.vimeo.com/video/'+video.name+'?api=1" width="100%" height="100%" frameborder="0"></iframe>')
 		},
+	ready: function () {
+  	Vimeo.player.addEvent('play', Vimeo.onPlay)
+  	Vimeo.player.addEvent('pause', Vimeo.onPause)
+  	Vimeo.player.addEvent('finish', Vimeo.finish)
+		Vimeo.player.api('play')
+	},
 	toggle: function ()
 		{
 		if (Vimeo.player.api_paused())
@@ -43,20 +63,26 @@ var Vimeo =
 	setVolume: function (vol)
 		{
 		Vimeo.volume = vol
-		Vimeo.player.api_setVolume(vol)
+		Vimeo.player.api('setVolume', vol)
 		},
+	onPlay: function(){
+	  Vimeo.playing = true
+	},
+	onPause: function(){
+	  Vimeo.playing = false
+	},
 	pause: function ()
 		{
 		d.warn("PAUSED PLAYBACK")
 		Vimeo.playing = false
-		Vimeo.player.api_pause()
+		Vimeo.player.api('pause')
 		return true
 		},
 	resume: function ()
 		{
 		d.warn("RESUME PLAYBACK")
 		Vimeo.playing = true
-		Vimeo.player.api_play()
+		Vimeo.player.api('play')
 		return false
 		},
 	stop: function ()
@@ -68,7 +94,7 @@ var Vimeo =
 		{
 		d.warn("VIMEO FINISH")
 		Vimeo.playing = false
-		swfobject.removeSWF("vimeo")
+		Vimeo.unload()
 		Player.finish()
 		},
 	load: function ()
@@ -79,21 +105,12 @@ var Vimeo =
 	unload: function ()
 		{
 		d.warn("VIMEO UNLOADED")
-		swfobject.removeSWF("vimeo")
+		$("#vimeo").empty()
 		Vimeo.loaded = false
 		},
 	init: function ()
 		{
 		d.warn("VIMEO INIT")
-		}
-	}
-function vimeo_player_loaded()
-	{
-	d.warn("VIMEO LOADED")
-	Vimeo.player = document.getElementById('vimeo')
-	Vimeo.player.api_play()
-	// Vimeo.player.addEventListener("finish", "Vimeo.finish")
-	Vimeo.player.api_addEventListener("finish", "Vimeo.finish")
-	Vimeo.player.api_setVolume(Vimeo.volume)
-	}
+		},
+	};
 Player.register(Vimeo)