merge

3 files changed, 5 insertions, 1 deletions

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 3f452e1..2fb870f 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -82,6 +82,8 @@
 
             // TODO: watch individual scenery object here
             Minotaur.watch( app.router.editorView.settings )
+
+						app.controller.pickWall(base, null)
           }
           else {
             app.controller.pickWall(base, null)
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 4408511..4fd145d 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -96,6 +96,7 @@ var BuilderInfo = View.extend({
 		this.room.rect.x.setLength( this.$width.unitVal() )
     Rooms.rebuild()
 	},
+	
 	enterDepth: function(e){
 	  if (e.keyCode == 13) this.changeDepth(e)
 	},
@@ -104,6 +105,7 @@ var BuilderInfo = View.extend({
 		this.room.rect.y.setLength( this.$depth.unitVal() )
     Rooms.rebuild()
 	},
+	
 	enterHeight: function(e){
 	  if (e.keyCode == 13) this.changeHeight(e)
 	},
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index 6195ab6..7f73e1b 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -44,7 +44,7 @@ var MediaPlayer = FormView.extend({
 			this.unbind()
 		}
 		if (media.type == "image") {
-			if ((! media.title || ! media.title.length) && (! media.description || ! media.description.length)) {
+			if ((! media.title || ! media.title.length) && (! media.description || ! media.description.length) || (media.title == filenameFromUrl(media.url)) ) {
 				this.hide()
 				return
 			}