pick initial frame

14 files changed, 43 insertions, 36 deletions

diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index b3e868a..886b8be 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -189,13 +189,13 @@ var SiteRouter = Router.extend({
 		
 		var name = e ? $(e.currentTarget).data("name") : name
 		
-		confirmModal.confirm("Are you sure you want to delete " + name + "?", $.proxy(function(){
-			this.documentModal.destroy(name, $.proxy(function(){
-				AlertModal.alert("Document deleted!", $.proxy(function(){
+		confirmModal.confirm("Are you sure you want to delete " + name + "?", function(){
+			this.documentModal.destroy(name, function(){
+				AlertModal.alert("Document deleted!", function(){
 					window.location.href = "/about"
-				}, this))
-			}, this))
-		}, this))
+				}.bind(this))
+			}.bind(this))
+		}.bind(this))
 		
 		// this.documentModal.destroy(name)
 	},
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index 9fcd55f..6006868 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -57,7 +57,7 @@ var BuilderSettings = FormView.extend({
 	
 	destroy: function(){
 		var msg = "Are you sure you want to delete the layout " + sanitize(this.$name.val()) + "?"
-		ConfirmModal.confirm(msg, $.proxy(function(){
+		ConfirmModal.confirm(msg, function(){
 			$.ajax({
 				url: this.destroyAction,
 				type: "delete",
@@ -66,7 +66,7 @@ var BuilderSettings = FormView.extend({
 					window.location.href = "/layout"
 				}
 			})
-		}, this))
+		}.bind(this))
 	},
 
 	toggle: function(){
diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js
index b42d3e7..a83bf43 100644
--- a/public/assets/javascripts/ui/builder/BuilderView.js
+++ b/public/assets/javascripts/ui/builder/BuilderView.js
@@ -20,7 +20,7 @@ var BuilderView = View.extend({
 		
 		name = sanitize(name)
 		
-		$.get(this.action + name, $.proxy(this.ready, this))
+		$.get(this.action + name, this.ready.bind(this))
 	},
 	
 	ready: function(data){
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)
 	},
 	
diff --git a/public/assets/javascripts/ui/lib/FormView.js b/public/assets/javascripts/ui/lib/FormView.js
index 0106ce0..219952d 100644
--- a/public/assets/javascripts/ui/lib/FormView.js
+++ b/public/assets/javascripts/ui/lib/FormView.js
@@ -26,9 +26,9 @@ var FormView = View.extend({
 				this.$errorList.append('<div>' + errors[i] + '</div>');
 			}
 			this.$errors.css("opacity", 1.0);
-			setTimeout($.proxy(function(){
+			setTimeout(function(){
 				this.$errors.show().css("opacity", 1.0);
-			}, this), 200)
+			}.bind(this), 200)
 		}
 	},
 	
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index add1ea1..bbdd437 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -15,7 +15,7 @@ var ReaderView = View.extend({
 			$(".logo,.topLinks,#editorView").hide()
 		}
 		name = sanitize(name)
-		$.get(this.projectAction + name, $.proxy(this.ready, this))
+		$.get(this.projectAction + name, this.ready.bind(this))
 	},
 	
 	ready: function(data){
diff --git a/public/assets/javascripts/ui/site/DocumentModal.js b/public/assets/javascripts/ui/site/DocumentModal.js
index 6f16169..067977d 100644
--- a/public/assets/javascripts/ui/site/DocumentModal.js
+++ b/public/assets/javascripts/ui/site/DocumentModal.js
@@ -20,7 +20,7 @@ var DocumentModal = ModalFormView.extend({
 
 		this.action = this.updateAction
 		
-		$.get("/api/docs", { name: name }, $.proxy(function(data){
+		$.get("/api/docs", { name: name }, function(data){
 			if (data.isNew) {
 				this.action = this.createAction
 			}
@@ -31,7 +31,7 @@ var DocumentModal = ModalFormView.extend({
 			this.$("[name='new_name']").val(name)
 
 			this.show()
-		}, this))
+		}.bind(this))
 	},
 	
 	success: function(res){
diff --git a/public/assets/javascripts/ui/site/EditProfileModal.js b/public/assets/javascripts/ui/site/EditProfileModal.js
index 6b89ad8..b023923 100644
--- a/public/assets/javascripts/ui/site/EditProfileModal.js
+++ b/public/assets/javascripts/ui/site/EditProfileModal.js
@@ -6,7 +6,7 @@ var EditProfileModal = ModalFormView.extend({
 
 	load: function(){
 		this.reset()
-		$.get("/api/profile", $.proxy(function(data){
+		$.get("/api/profile", function(data){
 			console.log(data)
 			
 			for (var i in data) {
@@ -23,7 +23,7 @@ var EditProfileModal = ModalFormView.extend({
 			}
 			
 			this.show()
-		}, this))
+		}.bind(this))
 	},
 
 	validate: function(){
diff --git a/public/assets/javascripts/ui/site/EditProjectModal.js b/public/assets/javascripts/ui/site/EditProjectModal.js
index 356d8b7..20baa54 100644
--- a/public/assets/javascripts/ui/site/EditProjectModal.js
+++ b/public/assets/javascripts/ui/site/EditProjectModal.js
@@ -31,7 +31,7 @@ var EditProjectModal = ModalView.extend({
 		var fields = this.$form.serializeArray()
 		
 		var request = $.post(this.action, $.param(fields));
-		request.done($.proxy(function (response) {
+		request.done(function (response) {
 			if (response.error) {
 				this.$errors.show();
 				for (var key in response.error.errors) {
@@ -42,7 +42,7 @@ var EditProjectModal = ModalView.extend({
 			else {
 				window.location.href = "/profile"
 			}
-		}, this));
+		}.bind(this));
 	}
 
 })
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index d474aa7..3b9e6cd 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -8,18 +8,18 @@ var LayoutsIndex = View.extend({
 	load: function(type){
 		this.$templates.children("span").remove()
 		
-		$.get(this.action, $.proxy(this.populate, this))
+		$.get(this.action, this.populate.bind(this))
 	},
 
 	populate: function(data){
-		data.forEach($.proxy(function(room){
+		data.forEach(function(room){
 			var $span = $("<span>")
 			// $span.html(JSON.stringify(room))
 			$span.data("slug", room.slug)
 			$span.css("background-image", "url(" + room.photo + ")")
 			
 			this.$templates.append($span)
-		}, this))
+		}.bind(this))
 		this.show()
 	}