From 699b0cff16371279ad637b98fc083fed468745f7 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Sat, 28 Apr 2012 11:07:18 -0700 Subject: [PATCH] don't expose follow/unfollow to a user in the UI following is good for bookkeeping in the database, but provides confusion, and could limit likes and/or commenting to start receiving notifications in a conversation. --- .../images/img/glyphicons-halflings-green.png | Bin 4133 -> 0 bytes app/assets/javascripts/app/models/post.js | 28 ------------- .../javascripts/app/views/feedback_view.js | 6 --- .../app/views/post-viewer/feedback.js | 1 - app/assets/stylesheets/new_styles/_base.scss | 1 - app/assets/templates/feedback.jst.hbs | 8 ---- .../templates/post-viewer/feedback.jst.hbs | 9 ---- .../templates/post-viewer/reactions.jst.hbs | 17 -------- spec/javascripts/app/models/post_spec.js | 39 ------------------ 9 files changed, 109 deletions(-) delete mode 100644 app/assets/images/img/glyphicons-halflings-green.png diff --git a/app/assets/images/img/glyphicons-halflings-green.png b/app/assets/images/img/glyphicons-halflings-green.png deleted file mode 100644 index 1907d9bf3a0a93d6ab0df9fd0fbecd7df0b80e77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4133 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 c<_k#!lyvK&G3r<1_W%Z%KrD - - {{#if user_participation}} - {{t "stream.unfollow"}} - {{else}} - {{t "stream.follow"}} - {{/if}} - -· - - {{#if userCanReshare}} {{#if user_reshare}} diff --git a/app/assets/templates/post-viewer/reactions.jst.hbs b/app/assets/templates/post-viewer/reactions.jst.hbs index c4217b591..9221f9bf9 100644 --- a/app/assets/templates/post-viewer/reactions.jst.hbs +++ b/app/assets/templates/post-viewer/reactions.jst.hbs @@ -15,23 +15,6 @@ {{/if}} -{{# if participations}} -
-
-
- -
-
- {{#each participations}} - {{#linkToPerson author}} - {{{personImage this "small" "micro"}}} - {{/linkToPerson}} - {{/each}} -
-
-
-{{/if}} - {{# if reshares}}
diff --git a/spec/javascripts/app/models/post_spec.js b/spec/javascripts/app/models/post_spec.js index 6d9f75070..90dbca87c 100644 --- a/spec/javascripts/app/models/post_spec.js +++ b/spec/javascripts/app/models/post_spec.js @@ -75,43 +75,4 @@ describe("app.models.Post", function() { expect(app.models.Like.prototype.destroy).toHaveBeenCalled(); }) }) - - describe("toggleFollow", function(){ - it("calls unfollow when the user_participation exists", function(){ - this.post.set({user_participation: "123"}); - spyOn(this.post, "unfollow").andReturn(true); - - this.post.toggleFollow(); - expect(this.post.unfollow).toHaveBeenCalled(); - }) - - it("calls follow when the user_participation does not exist", function(){ - this.post.set({user_participation: null}); - spyOn(this.post, "follow").andReturn(true); - - this.post.toggleFollow(); - expect(this.post.follow).toHaveBeenCalled(); - }) - }) - - describe("follow", function(){ - it("calls create on the participations collection", function(){ - spyOn(this.post.participations, "create"); - - this.post.follow(); - expect(this.post.participations.create).toHaveBeenCalled(); - }) - }) - - describe("unfollow", function(){ - it("calls destroy on the participations collection", function(){ - var participation = new app.models.Participation(); - this.post.set({user_participation : participation.toJSON()}) - - spyOn(app.models.Participation.prototype, "destroy"); - - this.post.unfollow(); - expect(app.models.Participation.prototype.destroy).toHaveBeenCalled(); - }) - }) });