From 55639122a00e77aaca1c6ac2faa5bc9f61ce7124 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Oct 2014 15:17:28 -0400
Subject: fix intro animation

---
 public/assets/javascripts/rectangles/models/wall.js   | 4 +++-
 public/assets/javascripts/ui/site/EditProfileModal.js | 1 -
 public/assets/stylesheets/app.css                     | 2 ++
 server/lib/api/profile.js                             | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index fdf54f0..ce958db 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -69,7 +69,9 @@
 				},
 */
 				mousedown: function(e){
-					if (Scenery.nextMedia) {
+					if (Scenery.nextText) {
+					}
+					else if (Scenery.nextMedia) {
             var scenery = Scenery.addNextToWall({
             	wall: base,
             	index: index
diff --git a/public/assets/javascripts/ui/site/EditProfileModal.js b/public/assets/javascripts/ui/site/EditProfileModal.js
index e4e1e10..d0e5d05 100644
--- a/public/assets/javascripts/ui/site/EditProfileModal.js
+++ b/public/assets/javascripts/ui/site/EditProfileModal.js
@@ -11,7 +11,6 @@ var EditProfileModal = ModalFormView.extend({
 	load: function(){
 		this.reset()
 		$.get("/api/profile", function(data){
-			console.log(data)
 			
 			for (var i in data) {
 				this.$("[name='" + i + "']").val(data[i])
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 3edad4f..32da0be 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1908,6 +1908,8 @@ form li textarea {
 	-webkit-transition:0.2s all;
 	-moz-transition:0.2s all;
 	transition:0.2s all;
+  -webkit-transform: translate3d(0,-999px,0);
+          transform: translate3d(0,-999px,0);
 }
 
 .desktop .hero .circle:hover {
diff --git a/server/lib/api/profile.js b/server/lib/api/profile.js
index fdd1bde..996505f 100644
--- a/server/lib/api/profile.js
+++ b/server/lib/api/profile.js
@@ -10,6 +10,8 @@ var _ = require('lodash'),
 var profile = {
 	show: function(req, res){
 		User.findOne({ _id: req.user._id }, function(err, user){
+		  user = user.toObject()
+		  delete user.password
 			res.json(err || user)
 		})
 	},
-- 
cgit v1.2.3-70-g09d2