From d8a798ea153a3020ccb21f79259a3ff13e8622e1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Oct 2014 14:52:00 -0400
Subject: toggle password fields

---
 public/assets/javascripts/ui/site/EditProfileModal.js | 8 ++++++++
 views/partials/edit-profile.ejs                       | 5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/public/assets/javascripts/ui/site/EditProfileModal.js b/public/assets/javascripts/ui/site/EditProfileModal.js
index b023923..e4e1e10 100644
--- a/public/assets/javascripts/ui/site/EditProfileModal.js
+++ b/public/assets/javascripts/ui/site/EditProfileModal.js
@@ -3,6 +3,10 @@ var EditProfileModal = ModalFormView.extend({
 	el: ".mediaDrawer.editProfile",
 	action: "/api/profile",
 	method: "put",
+	
+	events: {
+	  "click [data-role='changePasswordToggle']": 'togglePasswordFields'
+	},
 
 	load: function(){
 		this.reset()
@@ -25,6 +29,10 @@ var EditProfileModal = ModalFormView.extend({
 			this.show()
 		}.bind(this))
 	},
+	
+	togglePasswordFields: function(){
+    this.$("[data-role='changePasswordFields']").toggleClass("hidden")
+	},
 
 	validate: function(){
 		var errors = []
diff --git a/views/partials/edit-profile.ejs b/views/partials/edit-profile.ejs
index a39f856..5775ca5 100644
--- a/views/partials/edit-profile.ejs
+++ b/views/partials/edit-profile.ejs
@@ -59,11 +59,10 @@
 					<br>
 					<br><img id="load_avatar">
 				</li>		
-
 				<li class="section_break">
-					<h3 class="link">Change Password</h3>
+					<h3 class="link" data-role="changePasswordToggle">Change Password</h3>
 				</li>
-				<div class="hidden">
+				<div class="hidden" data-role="changePasswordFields">
 				<li>
 					<label class="description" for="profile_old_password">Old Password:</label>
 					<div>
-- 
cgit v1.2.3-70-g09d2


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


From f7c36f7a3394caa90937c5687f3ac7aeeed82e82 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Oct 2014 16:18:12 -0400
Subject: add media closer to where you clicked

---
 .../javascripts/rectangles/engine/scenery/move.js  |  1 -
 .../rectangles/engine/scenery/types/_object.js     | 26 ++++++++++++++++++++--
 .../rectangles/engine/scenery/types/image.js       |  9 +++++++-
 .../rectangles/engine/scenery/types/video.js       |  9 +++++++-
 .../assets/javascripts/rectangles/models/vec2.js   | 10 +++++++++
 .../assets/javascripts/rectangles/models/wall.js   |  9 ++++++--
 views/projects/list-projects.ejs                   |  7 +++---
 7 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js
index 981eb68..7d148cf 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/move.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/move.js
@@ -88,7 +88,6 @@ Scenery.move = function(base){
 	}
 
 	function up (e, cursor){
-	console.log(dragging, oldState)
     if (! dragging || ! oldState) return
     
 		dragging = false
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index 5eed53e..4e5e2c5 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -33,11 +33,33 @@ Scenery.types.base = Fiber.extend(function(base){
 			var center = this.bounds.center()
 			center.a -= this.dimensions.a / 2
 			center.b -= this.dimensions.b / 2
-			var mx_position = this.wall.positionToMx( center, this.dimensions )
-			this.mx.move(mx_position)
 			this.position.assign(center)
 		},
 		
+		translateTo: function (position){
+      var flipX = this.wall.side & (FRONT | RIGHT)
+      var delta = position.clone().subVec(this.position)
+      delta.a -= this.dimensions.a/2
+      delta.b -= this.dimensions.b/2
+      
+      if (flipX) { delta.a *= -1 }
+
+      var new_bounds = this.wall.surface.translate( this.bounds, this.dimensions, this.position, delta )
+
+      this.position.b += delta.b
+
+      switch (this.wall.side) {
+        case FRONT:
+        case BACK:
+          this.position.a += delta.a * cos(wall_rotation[this.wall.side])
+          break
+        case LEFT:
+        case RIGHT:
+          this.position.a += delta.a * sin(wall_rotation[this.wall.side])
+          break
+      }
+		},
+		
 		bind: function(){
 			this.move.bind()
 			$(this.mx.el).bind({
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/image.js b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
index d2fa3ab..aa43341 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/image.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/image.js
@@ -22,7 +22,14 @@ Scenery.types.image = Scenery.types.base.extend(function(base){
       }
       else {
       	this.set_wall(opt)
-        this.bounds && this.recenter()
+      	if (this.bounds) {
+          this.recenter()
+          if (opt.position) {
+            this.translateTo(opt.position)
+          }
+          var mx_position = this.wall.positionToMx( this.position, this.dimensions )
+          this.mx.move(mx_position)
+        }
       }
 		},
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index 76f32ac..2ef6ec3 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -21,7 +21,14 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
       }
       else {
       	this.set_wall(opt)
-        this.bounds && this.recenter()
+        if (this.bounds) {
+          this.recenter()
+          if (opt.position) {
+            this.translateTo(opt.position)
+          }
+          var mx_position = this.wall.positionToMx( this.position, this.dimensions )
+          this.mx.move(mx_position)
+        }
       }
     },
 
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index a5a832e..49613c3 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -63,6 +63,16 @@
 		this.b /= n
 		return this
 	}
+	vec2.prototype.addVec = function(v){
+	  this.a += v.a
+	  this.b += v.b
+	  return this
+	}
+  vec2.prototype.subVec = function(v){
+	  this.a -= v.a
+	  this.b -= v.b
+	  return this
+	}
 	vec2.prototype.zero = function(){
 		this.a = this.b = 0
 	}
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index ce958db..fdc8d8c 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -53,7 +53,6 @@
 /*
 				mousemove: function(e){
           var offset = offsetFromPoint(e, mx.el)
-          var shouldFlip = base.side & (RIGHT | FRONT)
           if (offset) {
             var pos = base.mxOffsetToPosition( offset, index )
             
@@ -72,9 +71,15 @@
 					if (Scenery.nextText) {
 					}
 					else if (Scenery.nextMedia) {
+            var offset = offsetFromPoint(e, mx.el)
+            if (! offset) { return }
+
+            var pos = base.mxOffsetToPosition( offset, index )
+
             var scenery = Scenery.addNextToWall({
             	wall: base,
-            	index: index
+            	index: index,
+            	position: pos,
             })
             
             // scenery was not placed
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index 5694648..f3332b2 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -14,11 +14,12 @@
             <img src="[[- media.media.url ]]">
           [[ }) ]]
 			  </span>
-				[[ if (String(user._id) == String(project.user_id)) { ]]
-				<a href="/project/[[- project.slug ]]/edit"><div class="editBtn">edit</div></a>
-				[[ } ]]
 				<div class="holder">
+				[[ if (String(user._id) == String(project.user_id)) { ]]
+        <a href="/project/[[- project.slug ]]/edit">
+				[[ } else { ]]
 				<a href="/project/[[- project.slug ]]" class="roomName">
+				[[ } ]]
 					[[- project.name ]]<br>
 					[[- project.date ]]
 				</a>
-- 
cgit v1.2.3-70-g09d2


From 0a060fc9c9c3b4f93a79e7ee350cbaeac14ba589 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Oct 2014 16:26:04 -0400
Subject: fix clear button

---
 public/assets/javascripts/rectangles/engine/scenery/_scenery.js | 2 +-
 public/assets/javascripts/ui/editor/EditorSettings.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index d34e299..69e9ba7 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -48,7 +48,7 @@ var Scenery = new function(){
 	base.find = function(id){
 		return base.list[id] || null
 	}
-		
+	
 	base.remove = function(id){
 		var scene_media = base.list[id]
 		delete base.list[id]
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index eb0d044..fd251b7 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -93,7 +93,7 @@ var EditorSettings = FormView.extend({
 	},
 	
 	clear: function(){
-		Rooms.removeAll()
+		Scenery.removeAll()
 	},
 	
 	destroy: function(){
-- 
cgit v1.2.3-70-g09d2


From c996ec3c93316b7a28b6707c9f7f595488d05cb9 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 2 Oct 2014 16:30:53 -0400
Subject: fix dot positioning

---
 .../rectangles/engine/scenery/resize.js            | 27 ++++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 2ba84a1..893237c 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -57,35 +57,32 @@ Scenery.resize = new function(){
 	
 	// move all the dots to the object's current position
 	base.move_dots = function(){
-		x = obj.mx.x + sin(rotationY) * dot_distance_from_picture
-		y = obj.mx.y
-		z = obj.mx.z - cos(rotationY) * dot_distance_from_picture
+		var x = obj.mx.x + sin(rotationY) * dot_distance_from_picture
+		var y = obj.mx.y
+		var z = obj.mx.z - cos(rotationY) * dot_distance_from_picture
 
 		dots.forEach(function(dot){
-			base.move_dot(dot)
+			base.move_dot(dot, { x: x, y: y, z: z })
 		})
 	}
 		
 	// move a dot .. to the initial position of the image
-	base.move_dot = function(dot){
-		dot.x = x
-		dot.y = y
-		dot.z = z
-		
+	base.move_dot = function(dot, pos){
 		if (dot.side & TOP) {
-			dot.y += obj.mx.height * obj.mx.scale / 2
+			pos.y += obj.dimensions.b / 2
 		}
 		if (dot.side & BOTTOM) {
-			dot.y -= obj.mx.height * obj.mx.scale / 2
+			pos.y -= obj.dimensions.b / 2
 		}
 		if (dot.side & LEFT) {
-			dot.x -= cos(rotationY) * (obj.mx.width * obj.mx.scale) / 2
-			dot.z -= sin(rotationY) * (obj.mx.width * obj.mx.scale) / 2
+			pos.x -= cos(rotationY) * (obj.dimensions.a) / 2
+			pos.z -= sin(rotationY) * (obj.dimensions.a) / 2
 		}
 		if (dot.side & RIGHT) {
-			dot.x += cos(rotationY) * (obj.mx.width * obj.mx.scale) / 2
-			dot.z += sin(rotationY) * (obj.mx.width * obj.mx.scale) / 2
+			pos.x += cos(rotationY) * (obj.dimensions.a) / 2
+			pos.z += sin(rotationY) * (obj.dimensions.a) / 2
 		}
+		dot.move(pos)
 	}
 
 	// pick a new object to focus on and show the dots
-- 
cgit v1.2.3-70-g09d2