pick initial frame

5 files changed, 22 insertions, 15 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 1d68b1b..887c894 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -65,7 +65,7 @@ var EditorSettings = FormView.extend({
 	
 	destroy: function(){
 		var msg = "Are you sure you want to delete the project " + sanitize(this.$name.val()) + "?"
-		ConfirmModal.confirm(msg, $.proxy(function(){
+		ConfirmModal.confirm(msg, function(){
 			$.ajax({
 				url: this.destroyAction,
 				type: "delete",
@@ -74,7 +74,7 @@ var EditorSettings = FormView.extend({
 					window.location.href = "/project"
 				}
 			})
-		}, this))
+		}.bind(this))
 	},
 
 	toggle: function(){
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 017e241..322637e 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -20,12 +20,12 @@ var EditorView = View.extend({
 
 	load: function(name){
 		name = sanitize(name)
-		$.get(this.projectAction + name, $.proxy(this.ready, this))
+		$.get(this.projectAction + name, this.ready.bind(this))
 	},
 	
 	loadLayout: function(layout){
 		layout = sanitize(layout)
-		$.get(this.layoutAction + layout, $.proxy(this.readyLayout, this))
+		$.get(this.layoutAction + layout, this.readyLayout.bind(this))
 	},
 	
 	ready: function(data){
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index 47a938b..29ec9e5 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -3,7 +3,8 @@ var MediaEditor = FormView.extend({
 	el: "#mediaEditor",
 		
 	events: {
-		"click .play": "togglePlaying",
+		"click .playButton": "togglePlaying",
+		"change [name=keyframe]": "seek",
 	},
 
 	initialize: function(opt){
@@ -20,7 +21,7 @@ var MediaEditor = FormView.extend({
 		this.$units = this.$("[name=units]")
 		
 		// video fields
-		this.$playButton = this.$(".play")
+		this.$playButton = this.$(".playButton")
 		this.$loop = this.$("[name=loop]")
 		this.$mute = this.$("[name=mute]")
 		this.$keyframe = this.$("[name=keyframe]")
@@ -39,7 +40,7 @@ var MediaEditor = FormView.extend({
 		if (this.scenery) {
 			this.unbind()
 		}
-	
+
 		this.bind(scenery)
 		this.$el.addClass("active")
 		
@@ -71,17 +72,23 @@ var MediaEditor = FormView.extend({
 				this.$mute
 				this.$keyframe
 				*/
-				
-				
 				break
 		}
+
+	},
+	
+	seek: function(){
+		var n = parseFloat( this.$keyframe.val() )
+		this.scenery.seek(n)
 	},
 	
 	bind: function(scenery){
 		this.scenery = scenery
+		this.scenery.media.bound = true
 	},
 	
 	unbind: function(){
+		this.scenery.media.bound = false
 		this.scenery = null
 	},
 
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index b7fea07..86bf767 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -39,7 +39,7 @@ var MediaUpload = View.extend({
 		var url = this.$url.val()
 		this.$url.val("")
 		
-		Parser.parse(url, $.proxy(function(media){
+		Parser.parse(url, function(media){
 			if (! media) {
 				alert("Not a valid image/video link")
 				return
@@ -53,8 +53,8 @@ var MediaUpload = View.extend({
 				url: this.createAction,
 				data: media,
 			})
-			request.done($.proxy(this.add, this))
-		}, this))
+			request.done(this.add.bind(this))
+		}.bind(this))
 	},
 	
 	handleFileSelect: function(e) {
@@ -109,7 +109,7 @@ var MediaUpload = View.extend({
 			processData: false,
 			contentType: false,
 		})
-		request.done($.proxy(this.add, this))
+		request.done(this.add.bind(this))
 	},
 	
 	add: function(media){
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 88c3b18..264ed7c 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -40,12 +40,12 @@ var MediaViewer = ModalView.extend({
 	},
 
 	load: function(){
-		$.get("/api/media/user", $.proxy(this.populate, this))
+		$.get("/api/media/user", this.populate.bind(this))
 	},
 
 	populate: function(data){
 		this.loaded = true
-		data && data.forEach($.proxy(this.add, this))
+		data && data.forEach(this.add.bind(this))
 		this.__super__.show.call(this)
 	},