fix click/bind behavior

4 files changed, 31 insertions, 7 deletions

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index a0f5b35..d03e0e1 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -34,7 +34,7 @@ var Scenery = new function(){
 			
 			case 'text':
 			  scene_media = new Scenery.types.text (opt)
-			  scene_media.focused = true
+			  scene_media.focused = !! opt.newMedia
 			  break
 		}
 		base.list[scene_media.id] = scene_media
@@ -42,6 +42,7 @@ var Scenery = new function(){
 	}
 	
 	base.addNextToWall = function(opt){
+	  opt.newMedia = true
 		opt.media = base.nextMedia
 		opt.index = opt.index || 0
 		var scene_media = base.add(opt)
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index de93f6e..21759d6 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -51,7 +51,7 @@ var MediaEditor = FormView.extend({
 	},
 	
 	pick: function(scenery) {
-		if (this.scenery) {
+		if (this.scenery && scenery !== this.scenery) {
 			this.unbind()
 		}
 
@@ -74,15 +74,17 @@ var MediaEditor = FormView.extend({
 		
 		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)
@@ -90,6 +92,15 @@ var MediaEditor = FormView.extend({
 				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
 		}
 	},
 
@@ -161,6 +172,7 @@ var MediaEditor = FormView.extend({
 	
 	unbind: function(){
 	  if (this.scenery) {
+	    this.scenery.focused = false
 	    if (this.tainted && this.scenery.media) {
         this.scenery.media.title = this.$name.val()
         this.scenery.media.description = this.$description.val()
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index d897f91..53d5b9f 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -96,6 +96,7 @@ var TextEditor = FormView.extend({
 	
 	unbind: function(){
 	  if (this.scenery) {
+	    this.scenery.focused = false
       if (this.tainted) {
         Minotaur.watch( app.router.editorView.settings )
       }
@@ -119,7 +120,7 @@ var TextEditor = FormView.extend({
   },
   
   pick: function(scenery){
-		if (this.scenery) {
+		if (this.scenery && scenery !== this.scenery) {
 			this.unbind()
 		}
 
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index f5a0d2c..8424d9c 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -61,8 +61,9 @@ var MediaPlayer = FormView.extend({
 		
 		switch (media.type) {
 			case "image":
-				this.$(".image").show()
 				this.$(".video").hide()
+				this.$(".audio").hide()
+				this.$(".image").show()
 
 // 				this.$widthDimension.html( Number(media.widthDimension) || "" )
 // 				this.$heightDimension.html( Number(media.heightDimension) || "" )
@@ -73,13 +74,22 @@ var MediaPlayer = FormView.extend({
 			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.$muteButton.toggleClass("muted", this.scenery.muted())
 
 				break
+			
+			case "soundcloud":
+				this.$(".image").hide()
+				this.$(".video").hide()
+				this.$(".audio").show()
+
+				this.$playButton.toggleClass("paused", ! this.scenery.paused())
+			  break
 		}
 		return true
 	},