diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-09-30 02:13:29 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-09-30 02:13:29 -0400 |
| commit | 6ba3c656827c8e1fa84724c6b5dc2ba4f0991ffe (patch) | |
| tree | 3959a14e110857ac2c88a344949f24fdb3fe42ca /public/assets/javascripts/ui/site | |
| parent | a8d3a30892687f58e3f18b768104ea54480cd465 (diff) | |
| parent | 4a0717d5f8aa0ff3378ff589b106cd35c0586367 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/site')
| -rw-r--r-- | public/assets/javascripts/ui/site/LayoutsModal.js | 4 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/site/ProjectList.js | 4 |
2 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 f109ec3..2449465 100644 --- a/public/assets/javascripts/ui/site/LayoutsModal.js +++ b/public/assets/javascripts/ui/site/LayoutsModal.js @@ -25,9 +25,11 @@ var LayoutsIndex = View.extend({ // $span.html(JSON.stringify(room)) $span.data("slug", room.slug) $span.css("background-image", "url(" + room.photo + ")") + $span.attr("data-name", room.name) this.$templates.append($span) }.bind(this)) + console.log(this.$templates.html()) this.show() } @@ -57,7 +59,7 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({ this.$(".templates .active").removeClass("active") var $layout = $(e.currentTarget) $layout.addClass("active") - + // actually do window.location.pathname = "/project/" + $layout.data("slug") + "/edit" }, diff --git a/public/assets/javascripts/ui/site/ProjectList.js b/public/assets/javascripts/ui/site/ProjectList.js index ee1b89f..993d805 100644 --- a/public/assets/javascripts/ui/site/ProjectList.js +++ b/public/assets/javascripts/ui/site/ProjectList.js @@ -4,8 +4,8 @@ var ProjectList = View.extend({ el: ".projectList", events: { - "mouseenter td.border": 'spinOn', - "mouseleave td.border": 'spinOff', + "mouseenter .room": 'spinOn', + "mouseleave .room": 'spinOff', }, initialize: function(){ |