1 files changed, 47 insertions, 16 deletions

diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index 9b20a43..6068c48 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -3,7 +3,7 @@ var MediaEditor = FormView.extend({
 	el: "#mediaEditor",
 		
 	events: {
-		"keydown": 'stopPropagation',
+		"keydown": 'taint',
 		"focus [name]": "clearMinotaur",
 		"click [data-role=play-media]": "togglePaused",
 		"mousedown [name=keyframe]": "stopPropagation",
@@ -51,40 +51,56 @@ var MediaEditor = FormView.extend({
 	},
 	
 	pick: function(scenery) {
-		if (this.scenery) {
+		if (this.scenery && scenery !== this.scenery) {
 			this.unbind()
 		}
 
 		this.bind(scenery)
 		this.$el.addClass("active")
 		
+//     app.controller.toolbar.resetMode()
+    app.controller.toolbar.resetControls()
+		Scenery.resize.show(scenery)
+		Scenery.hovering = true
+		
 		var media = scenery.media
 		
-		this.$name.val(media.title)
+		// console.log(media)
+		
+		this.$name.val(media.title) // || filenameFromUrl(media.url) )
 		this.$description.val(media.description)
 		this.setDimensions()
 		this.$units.val( "ft" )
 		
 		switch (media.type) {
 			case "image":
-				this.$(".image").show()
 				this.$(".video").hide()
-								
+				this.$(".audio").hide()
+				this.$(".image").show()
 				break
 
 			case "youtube":
 			case "vimeo":
 			case "video":
-				this.$(".video").show()
 				this.$(".image").hide()
+				this.$(".audio").hide()
+				this.$(".video").show()
 				
 				this.$playButton.toggleClass("paused", ! this.scenery.paused())
 				this.$autoplay.prop('checked', !! media.autoplay)
 				this.$loop.prop('checked', !! media.loop)
 				this.$mute.prop('checked', !! media.mute)
 				this.$keyframe.val( Number(media.keyframe || 0) )
-
 				break
+			
+			case "soundcloud":
+				this.$(".image").hide()
+				this.$(".video").hide()
+				this.$(".audio").show()
+				this.$playButton.toggleClass("paused", ! this.scenery.paused())
+				this.$autoplay.prop('checked', !! media.autoplay)
+				this.$loop.prop('checked', !! media.loop)
+			  break
 		}
 	},
 
@@ -98,12 +114,14 @@ var MediaEditor = FormView.extend({
 	seek: function(){
 		var n = parseFloat( this.$keyframe.val() )
 		this.scenery.seek(n)
+		this.tainted = true
 		
 		this.scenery.media.keyframe = n
 	},
 	setAutoplay: function(){
 		var checked = this.$autoplay.prop('checked')
 		this.scenery.media.autoplay = checked
+		this.tainted = true
 		if (checked && this.scenery.paused()) {
 			this.togglePaused()
 		}
@@ -111,17 +129,20 @@ var MediaEditor = FormView.extend({
 	setLoop: function(){
 		var checked = this.$loop.prop('checked')
 		this.scenery.setLoop(checked)
+		this.tainted = true
 	},
 	setMute: function(){
 		var checked = this.$mute.prop('checked')
 		this.scenery.media.mute = checked
 		this.scenery.mute(checked)
+		this.tainted = true
 	},
 
 	setDimensions: function(){
 	  if (! this.scenery) return
 		this.$width.unitVal( Number(this.scenery.naturalDimensions.a * this.scenery.scale) || "" )
 		this.$height.unitVal( Number(this.scenery.naturalDimensions.b * this.scenery.scale) || "" )
+		this.tainted = true
 	},
 	changeWidth: function(e){
 		e.stopPropagation()
@@ -137,6 +158,11 @@ var MediaEditor = FormView.extend({
 		app.units = this.$units.val()
 		this.$('.units').resetUnitVal()
 	},
+	
+	taint: function(e){
+	  e.stopPropagation()
+		this.tainted = true
+	},
 
 	bind: function(scenery){
 		this.scenery = scenery
@@ -146,24 +172,29 @@ var MediaEditor = FormView.extend({
 	
 	unbind: function(){
 	  if (this.scenery) {
-      this.scenery.media.title = this.$name.val()
-      this.scenery.media.description = this.$description.val()
-      Minotaur.watch( app.router.editorView.settings )
-
+	    this.scenery.focused = false
+	    if (this.tainted && this.scenery.media) {
+        this.scenery.media.title = this.$name.val()
+        this.scenery.media.description = this.$description.val()
+        Minotaur.watch( app.router.editorView.settings )
+      }
 	    if (this.scenery.mx) {
         this.scenery.mx.bound = false
         this.scenery.mx.el.classList.remove("picked")
       }
     }
+    this.tainted = false
     this.scenery = null
 	},
 	
 	destroy: function(){
-		ConfirmModal.confirm("Are you sure you want delete to this media?", function(){
-			var scenery = this.scenery
-			this.hide()
-			Scenery.remove(scenery.id)
-		}.bind(this))
+    var scenery = this.scenery
+    this.hide()
+
+    scenery.remove()
+    
+    this.tainted = false
+    this.scenery = null
 	},
 
 })