From 79a8caa17b05152533641cfd937925822f569fc1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 3 Nov 2014 15:11:27 -0500
Subject: after you delete a room, user is redirected to profile

---
 public/assets/javascripts/mx/extensions/mx.movements.js     | 6 ++----
 public/assets/javascripts/rectangles/engine/scenery/undo.js | 2 +-
 public/assets/javascripts/ui/editor/EditorSettings.js       | 2 +-
 public/assets/javascripts/ui/editor/Presets.js              | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'public/assets/javascripts')

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 2993fb6..dc9660b 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -326,15 +326,13 @@ MX.Movements = function (cam) {
 					pos.y = viewHeight
 					vy = 0
 					jumping = false
-					vz = vz || 1
 				}
 
 				var ceiling = (Rooms.mover.room ? Rooms.mover.room.height : 5000)
 				
-				if (pos.y >= ceiling) {
+				if (pos.y >= ceiling-5) {
 					vy = 0
-					pos.y = ceiling
-					vz = vz || 1
+					pos.y = ceiling-5
 				}
 			}
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/undo.js b/public/assets/javascripts/rectangles/engine/scenery/undo.js
index 52a57d9..3deb764 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/undo.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/undo.js
@@ -20,7 +20,7 @@
       type: "update-scenery",
       undo: function(state){
         var scenery = Scenery.find(state.id)
-        
+
         scenery.deserialize(state)
         scenery.set_wall(Walls.find( state.wall_id ))
         
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 430acc7..b96943e 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -114,7 +114,7 @@ var EditorSettings = FormView.extend({
 				type: "delete",
 				data: { _id: this.$id.val(), _csrf: this.$csrf.val() },
 				success: function(data){
-					window.location.href = "/project"
+					window.location.href = "/profile"
 				}
 			})
 		}.bind(this))
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index 1327e03..5f5ac35 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -20,7 +20,7 @@ var Presets = View.extend({
       ceiling: [159,163,157],
       background: [109,116,106],
     },
-    "p.Funk": {
+    "P.Funk": {
       wall: [255,63,78],
       outline: [255,246,0],
       floor: [255,255,0],
-- 
cgit v1.2.3-70-g09d2