disable room movement when clicking in things with .vvbox class

9 files changed, 9 insertions, 1 deletions

diff --git a/public/assets/javascripts/rectangles/models/surface.js b/public/assets/javascripts/rectangles/models/surface.js
index c85682a..3a6c449 100644
--- a/public/assets/javascripts/rectangles/models/surface.js
+++ b/public/assets/javascripts/rectangles/models/surface.js
@@ -108,7 +108,7 @@
 		this.clamp_delta( this.bounds, dimension, position, delta )
 
 		var new_delta = delta.clone()
-		if (this.clamp_delta(old_bounds, dimension, position, new_delta).eq(delta)) {
+		if (old_bounds && this.clamp_delta(old_bounds, dimension, position, new_delta).eq(delta)) {
 			return old_bounds
 		}
 
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index e6b7e97..f7753a3 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -3,6 +3,7 @@ var BuilderInfo = View.extend({
 	el: "#builderInfo",
 
 	events: {
+	  "mousedown": "stopPropagation",
 		"keydown": 'stopPropagation',
 		"change [name=x]": 'changeX',
 		"change [name=y]": 'changeY',
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index 7ae6294..fe67e9b 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -7,6 +7,7 @@ var BuilderSettings = FormView.extend({
 	destroyAction: "/api/layout/destroy",
 
 	events: {
+	  "mousedown": "stopPropagation",
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
 		"click [data-role='save-layout']": 'clickSave',
diff --git a/public/assets/javascripts/ui/builder/BuilderToolbar.js b/public/assets/javascripts/ui/builder/BuilderToolbar.js
index 2eb7590..6c218be 100644
--- a/public/assets/javascripts/ui/builder/BuilderToolbar.js
+++ b/public/assets/javascripts/ui/builder/BuilderToolbar.js
@@ -3,6 +3,7 @@ var BuilderToolbar = View.extend({
 	el: "#builderToolbar",
 
 	events: {
+	  "mousedown": "stopPropagation",
 		"click [data-role='toggle-map-view']": 'toggleMap',
 		"click [data-role='toggle-layout-settings']": 'toggleSettings',
 		"click [data-role='undo']": 'undo',
diff --git a/public/assets/javascripts/ui/editor/Collaborators.js b/public/assets/javascripts/ui/editor/Collaborators.js
index 452ad15..b57510d 100644
--- a/public/assets/javascripts/ui/editor/Collaborators.js
+++ b/public/assets/javascripts/ui/editor/Collaborators.js
@@ -9,6 +9,7 @@ var Collaborators = ModalFormView.extend({
 	destroyAction: function(){ return "/api/collaborator/" + this.parent.data.slug + "/destroy" },
 	
 	events: {
+	  "mousedown": "stopPropagation",
 	  "keydown [name=email]": "enterSubmit",
 	  "click [data-role=destroy-collaborator]": "destroy",
 	},
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 0c08369..45a2e43 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -7,6 +7,7 @@ var EditorSettings = FormView.extend({
 	destroyAction: "/api/project/destroy",
   
 	events: {
+	  "mousedown": "stopPropagation",
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
 		"click [data-role='show-collaborators']": 'showCollaborators',
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index bab4679..fddfefc 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -6,6 +6,7 @@ var MediaUpload = UploadView.extend({
 	uploadAction: "/api/media/upload",
 	
 	events: {
+    'mousedown': "stopPropagation",
 		"keydown .url": "enterSubmit",
 	},
 	
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 1414e16..c18fb49 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -6,6 +6,7 @@ var MediaViewer = ModalView.extend({
 	loaded: false,
 	
 	events: {
+	  'mousedown': "stopPropagation",
 		'click .foundToggle': "foundToggle",
 		'click .userToggle': "userToggle",
 		'click #deleteMedia': "deleteArmed",
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 0aa5aad..c8879b3 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -92,6 +92,7 @@ var TextEditor = FormView.extend({
 			this.unbind()
 		}
 
+    this.parent.settings.hide()
 		Scenery.resize.show(scenery)
 		Scenery.hovering = true