diff options
| author | Julie Lala <jules@okfoc.us> | 2014-08-11 00:10:24 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-08-11 00:10:24 -0400 |
| commit | 02bde51c24ae1c6e189d031b80226e6a9f7cbc59 (patch) | |
| tree | a64f5a040787b0b513c20ab8582aea171184736e /public/assets/javascripts/ui/site/LayoutsModal.js | |
| parent | 04c2c21ad2ed872137b7a7e633d6bebcd7b04b61 (diff) | |
| parent | 9cd88d59e45b530e483490804503e6b47030fd4d (diff) | |
merge master
Diffstat (limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')
| -rw-r--r-- | public/assets/javascripts/ui/site/LayoutsModal.js | 8 |
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 } |