From 096f932ef22f2235d8ced8c66ae36049fb7a19ce Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Fri, 16 Aug 2019 13:06:51 +1000 Subject: [PATCH] Lint files Both needed some prettier tlc --- .../controllers/poll-ui-builder.js.es6 | 14 ++++++++++++-- .../javascripts/widgets/discourse-poll.js.es6 | 17 +++++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 index 916b73f65e8..9550b286b5f 100644 --- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 +++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 @@ -37,8 +37,18 @@ export default Ember.Controller.extend({ ]; }, - @computed("alwaysPollResult", "votePollResult", "closedPollResult", "staffPollResult") - pollResults(alwaysPollResult, votePollResult, closedPollResult, staffPollResult) { + @computed( + "alwaysPollResult", + "votePollResult", + "closedPollResult", + "staffPollResult" + ) + pollResults( + alwaysPollResult, + votePollResult, + closedPollResult, + staffPollResult + ) { return [ { name: I18n.t("poll.ui_builder.poll_result.always"), diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 index 3b589e80280..15ef6ee1301 100644 --- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 +++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 @@ -402,7 +402,12 @@ createWidget("discourse-poll-info", { } } - if (!attrs.isClosed && !attrs.showResults && poll.public && (poll.results !== "staff_only")) { + if ( + !attrs.isClosed && + !attrs.showResults && + poll.public && + poll.results !== "staff_only" + ) { contents.push(infoTextHtml(I18n.t("poll.public.title"))); } @@ -494,8 +499,7 @@ createWidget("discourse-poll-buttons", { if ( this.currentUser && - (this.currentUser.get("id") === post.get("user_id") || - isStaff) && + (this.currentUser.get("id") === post.get("user_id") || isStaff) && !topicArchived ) { if (closed) { @@ -545,8 +549,7 @@ export default createWidget("discourse-poll", { const showResults = (post.get("topic.archived") && !staffOnly) || (this.isClosed() && !staffOnly) || - (poll.results !== "on_close" && - this.hasVoted() && !staffOnly); + (poll.results !== "on_close" && this.hasVoted() && !staffOnly); return { loading: false, showResults }; }, @@ -554,7 +557,9 @@ export default createWidget("discourse-poll", { html(attrs, state) { const staffOnly = attrs.poll.results === "staff_only"; const showResults = - state.showResults || (attrs.post.get("topic.archived") && !staffOnly) || (this.isClosed() && !staffOnly); + state.showResults || + (attrs.post.get("topic.archived") && !staffOnly) || + (this.isClosed() && !staffOnly); const newAttrs = jQuery.extend({}, attrs, { canCastVotes: this.canCastVotes(),