From dbe3b48aee948cd1027898dfa02716c51a6ad4f9 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Mon, 23 Apr 2012 23:04:53 -0700 Subject: [PATCH] now you can click on an entire post to favorite / unfav it. yay. [ci skip] --- .../javascripts/app/views/small_frame.js | 1 + .../stylesheets/new_styles/_profile.scss | 7 +++++- .../app/views/small_frame_view_spec.js | 23 ++++++++++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/views/small_frame.js b/app/assets/javascripts/app/views/small_frame.js index 2b727bb6a..db46199cf 100644 --- a/app/assets/javascripts/app/views/small_frame.js +++ b/app/assets/javascripts/app/views/small_frame.js @@ -69,6 +69,7 @@ app.views.SmallFrame = app.views.Base.extend({ }, goToPost : function() { + if(app.page.editMode) { this.favoritePost(); return false; } app.router.navigate(this.model.url(), true) } }); \ No newline at end of file diff --git a/app/assets/stylesheets/new_styles/_profile.scss b/app/assets/stylesheets/new_styles/_profile.scss index f53f5ba8a..f1f5d6af4 100644 --- a/app/assets/stylesheets/new_styles/_profile.scss +++ b/app/assets/stylesheets/new_styles/_profile.scss @@ -41,13 +41,18 @@ .edit-mode { #edit-controls { @include opacity(1); - //display : block; } .canvas-frame .fav { @include opacity(1) } + .canvas-frame { + .info { + display : none + } + } + #edit-mode-toggle.control { @include opacity(1); } diff --git a/spec/javascripts/app/views/small_frame_view_spec.js b/spec/javascripts/app/views/small_frame_view_spec.js index d848fec91..8760bf8ab 100644 --- a/spec/javascripts/app/views/small_frame_view_spec.js +++ b/spec/javascripts/app/views/small_frame_view_spec.js @@ -18,4 +18,25 @@ describe("app.views.SmallFrame", function(){ describe("photos", function() { // ratio pending... }) -}); \ No newline at end of file + + describe("redirecting to a post", function(){ + beforeEach(function(){ + app.router = new app.Router() + spyOn(app.router, "navigate") + }) + + it("redirects", function() { + this.view.goToPost() + expect(app.router.navigate).toHaveBeenCalled() + }) + + it("doesn't redirect if the page is in edit mode, and instead favorites the post", function() { + app.page = {editMode : true} + + spyOn(this.view, "favoritePost") + this.view.goToPost() + expect(app.router.navigate).not.toHaveBeenCalled() + expect(this.view.favoritePost).toHaveBeenCalled() + }) + }) +});