From dec7ef667e38503e857101b59ff78c5a1bff9660 Mon Sep 17 00:00:00 2001 From: Lukas Matt Date: Mon, 16 Jun 2014 10:18:47 -0400 Subject: [PATCH] Hide SPV controls unless authenticated * cleaned and removed dead code refs diaspora/diaspora#4711 --- .../javascripts/app/views/feedback_view.js | 7 ---- app/assets/templates/comment_tpl.jst.hbs | 18 ++++---- .../single-post-actions_tpl.jst.hbs | 41 ++++++++++--------- 3 files changed, 31 insertions(+), 35 deletions(-) diff --git a/app/assets/javascripts/app/views/feedback_view.js b/app/assets/javascripts/app/views/feedback_view.js index 41e957c89..c230d2b4f 100644 --- a/app/assets/javascripts/app/views/feedback_view.js +++ b/app/assets/javascripts/app/views/feedback_view.js @@ -4,7 +4,6 @@ app.views.Feedback = app.views.Base.extend({ className : "info", events: { - "click *[rel='auth-required']" : "requireAuth", "click .like" : "toggleLike", "click .reshare" : "resharePost", "click .post_report" : "report" @@ -39,11 +38,5 @@ app.views.Feedback = app.views.Base.extend({ if(evt) { evt.preventDefault(); } if(!window.confirm(Diaspora.I18n.t("reshares.post", {name: this.model.reshareAuthor().name}))) { return } this.model.interactions.reshare(); - }, - - requireAuth : function(evt) { - if( app.currentUser.authenticated() ) { return } - alert("you must be logged in to do that!") - return false; } }); diff --git a/app/assets/templates/comment_tpl.jst.hbs b/app/assets/templates/comment_tpl.jst.hbs index 5d5c7c1cf..23eb368d9 100644 --- a/app/assets/templates/comment_tpl.jst.hbs +++ b/app/assets/templates/comment_tpl.jst.hbs @@ -7,14 +7,16 @@
- {{#if canRemove}} - -
- - {{else}} - -
- + {{#if loggedIn}} + {{#if canRemove}} + +
+ + {{else}} + +
+ + {{/if}} {{/if}}
diff --git a/app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs b/app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs index c70b326f6..be1bec2c8 100644 --- a/app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs +++ b/app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs @@ -1,30 +1,31 @@
- - - + + - + {{#if userCanReshare}} - - - + + + {{else}} - {{#if userReshare}} - - - - {{/if}} + {{#if userReshare}} + + + + {{/if}} {{/if}} - - + + ! -
+ {{/if}}