merge

1 files changed, 8 insertions, 7 deletions

diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index 9b2f753..c551f95 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -2,11 +2,12 @@
 var BuilderSettings = FormView.extend({
 	el: "#builderSettings",
 	
-	createAction: "/api/layouts/new",
-	updateAction: "/api/layouts/edit",
-	destroyAction: "/api/layouts/destroy",
+	createAction: "/api/layout/new",
+	updateAction: "/api/layout/edit",
+	destroyAction: "/api/layout/destroy",
 
 	events: {
+		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
 		"click [data-role='save-layout']": 'save',
 		"click [data-role='clone-layout']": 'clone',
@@ -57,7 +58,7 @@ var BuilderSettings = FormView.extend({
 	
 	destroy: function(){
 		var msg = "Are you sure you want to delete the layout " + sanitize(this.$name.val()) + "?"
-		ConfirmModal.confirm(msg, $.proxy(function(){
+		ConfirmModal.confirm(msg, function(){
 			$.ajax({
 				url: this.destroyAction,
 				type: "delete",
@@ -66,11 +67,11 @@ var BuilderSettings = FormView.extend({
 					window.location.href = "/layout"
 				}
 			})
-		}, this))
+		}.bind(this))
 	},
 
-	toggle: function(){
-		this.$el.toggleClass("active")
+	toggle: function(state){
+		this.$el.toggleClass("active", state)
 	},
 
 	enterSubmit: function (e) {