From d9a6199f75d324c7b644beb1c732680a67ab8047 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 17 Oct 2014 13:37:23 -0400
Subject: layout editor stuff

---
 .../assets/javascripts/rectangles/models/floor.js  | 34 +++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'public/assets/javascripts/rectangles/models')

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index a144ecd..3f452e1 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -36,8 +36,40 @@
 
 		this.mx.forEach(function(mx, index){
 			$(mx.el).bind({
+        contextmenu: function(e){
+          if (! (e.ctrlKey || e.metaKey || e.shiftKey) ) {
+            e.preventDefault()
+          }
+          if (Scenery.nextMedia) {
+            e.preventDefault()
+            Scenery.nextMedia = null
+            app.tube('cancel-scenery')
+          }
+          else if (Scenery.nextWallpaper) {
+            e.preventDefault()
+            Scenery.nextWallpaper = null
+            app.tube('cancel-wallpaper')
+          }
+        },
+
 				mousedown: function(e){
-					if (Scenery.nextWallpaper) {
+				  
+				  // right-click
+				  if (e.which == 3) {
+				    if (Scenery.nextMedia) {
+				      e.preventDefault()
+              Scenery.nextMedia = null
+              app.tube('cancel-scenery')
+				    }
+				    else if (Scenery.nextWallpaper) {
+				      e.preventDefault()
+              Scenery.nextWallpaper = null
+              app.tube('cancel-wallpaper')
+				    }
+				    return
+				  }
+
+          if (Scenery.nextWallpaper) {
 					  var oldState = base.serialize()
 						base.wallpaper(Scenery.nextWallpaper)
 						// Scenery.nextWallpaper = null
-- 
cgit v1.2.3-70-g09d2


From a6d479579964014077502db5bc6e3af59c1f317e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Sat, 18 Oct 2014 09:34:46 -0400
Subject: reader adjustments

---
 public/assets/javascripts/rectangles/models/floor.js |  2 ++
 public/assets/javascripts/ui/builder/BuilderInfo.js  |  2 ++
 public/assets/javascripts/ui/reader/MediaPlayer.js   |  2 +-
 public/assets/stylesheets/app.css                    | 11 +++++++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'public/assets/javascripts/rectangles/models')

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
 			}
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 9df1573..226fe98 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1930,8 +1930,8 @@ input[type="range"]::-webkit-slider-thumb {
 }
 
 .playButton,.muteButton {
-	border-radius: 50px;
-	font-size: 22px;
+	border-radius: 50%;
+	font-size: 23px;
 	padding: 5px 0;
 	cursor: pointer;
 	margin-right: 5px;
@@ -1942,6 +1942,8 @@ input[type="range"]::-webkit-slider-thumb {
 }
 .playButton .on {
 	display: inline;
+  position: relative;
+  left: 1px;
 }
 .playButton.paused .on {
 	display: none;
@@ -1956,6 +1958,8 @@ input[type="range"]::-webkit-slider-thumb {
 .muteButton .on {
 	display: inline;
 	padding-right: 3px;
+  position: relative;
+  left: 2px;
 }
 .muteButton.muted .on {
 	display: none;
@@ -1966,6 +1970,9 @@ input[type="range"]::-webkit-slider-thumb {
 .muteButton.muted .off {
 	display: inline;
 	padding-right: 3px;
+  position: relative;
+  left: 2px;
+  top: -1px;
 }
 
 .btn, button {
-- 
cgit v1.2.3-70-g09d2