merge

1 files changed, 5 insertions, 3 deletions

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 4948b0e..f109ec3 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -19,6 +19,7 @@ var LayoutsIndex = View.extend({
 			this.$form.hide()
 			this.$noTemplates.show()
 		}
+		this.$templates.empty()
 		data.forEach(function(room){
 			var $span = $("<span>")
 			// $span.html(JSON.stringify(room))
@@ -58,7 +59,7 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({
 		$layout.addClass("active")
 		
 		// actually do
-		window.location.pathname = "/project/" + $layout.data("slug")
+		window.location.pathname = "/project/" + $layout.data("slug") + "/edit"
 	},
 	
 	newProject: function(e){
@@ -103,7 +104,7 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
 	action: "/api/layout",
 
 	events: {
-		"click .templates span": 'toggleActive',
+		"click .templates span": 'choose',
 		"submit form": 'choose',
 	},
 	
@@ -115,7 +116,8 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
 	
 	choose: function(e){
 		e && e.preventDefault()
-		var layout = this.$(".templates .active").data("slug")
+// 		var layout = this.$(".templates .active").data("slug")
+ 		var layout = $(e.currentTarget).data("slug")
 		if (! layout || ! layout.length) return
 		window.location.pathname = "/project/new/" + layout
 	}