From 5f08630c27c9249a6a8f08ad8d97d800449b1058 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 13 Jan 2017 15:48:49 -0500
Subject: [PATCH] Update topic status to use more ES6 features, clean up

---
 .../discourse/raw-views/topic-status.js.es6   | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
index 17e370bc6ee..e5d5befde9b 100644
--- a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
@@ -1,54 +1,58 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
 export default Ember.Object.extend({
-  renderDiv: function(){
+
+  @computed
+  renderDiv() {
     return this.get('statuses').length > 0 && !this.noDiv;
-  }.property(),
-  statuses: function(){
-    var topic = this.get("topic");
-    var results =  [];
-    var self = this;
+  },
+
+  @computed
+  statuses() {
+    const topic = this.get("topic");
+    const results =  [];
 
     // TODO, custom statuses? via override?
-
-    if(topic.get('is_warning')){
+    if (topic.get('is_warning')) {
       results.push({icon: 'envelope', key: 'warning'});
     }
 
-    if(topic.get('bookmarked')){
-      var url = topic.get('url');
-      var postNumbers = topic.get('bookmarked_post_numbers');
-      var extraClasses = "";
-      if(postNumbers && postNumbers[0] > 1) {
+    if (topic.get('bookmarked')) {
+      const postNumbers = topic.get('bookmarked_post_numbers');
+      let url = topic.get('url');
+      let extraClasses = "";
+      if (postNumbers && postNumbers[0] > 1) {
         url += '/' + postNumbers[0];
       } else {
         extraClasses = "op-bookmark";
       }
 
-      results.push({extraClasses: extraClasses, icon: 'bookmark', key: 'bookmarked', href: url});
+      results.push({ extraClasses, icon: 'bookmark', key: 'bookmarked', href: url });
     }
 
     if (topic.get('closed') && topic.get('archived')) {
       results.push({icon: 'lock', key: 'locked_and_archived'});
-    } else if(topic.get('closed')){
+    } else if (topic.get('closed')) {
       results.push({icon: 'lock', key: 'locked'});
-    } else if(topic.get('archived')){
+    } else if (topic.get('archived')) {
       results.push({icon: 'lock', key: 'archived'});
     }
 
-    if(topic.get('pinned')){
+    if (topic.get('pinned')) {
       results.push({icon: 'thumb-tack', key: 'pinned'});
     }
 
-    if(topic.get('unpinned')){
+    if (topic.get('unpinned')) {
       results.push({icon: 'thumb-tack unpinned', key: 'unpinned'});
     }
 
-    if(topic.get('invisible')){
+    if (topic.get('invisible')) {
       results.push({icon: 'eye-slash', key: 'invisible'});
     }
 
-    _.each(results, function(result){
-      result.title = I18n.t("topic_statuses." + result.key + ".help");
-      if(!self.disableActions && (result.key === "pinned" ||result.key === "unpinned")){
+    results.forEach(result => {
+      result.title = I18n.t(`topic_statuses.${result.key}.help`);
+      if (!self.disableActions && (result.key === "pinned" ||result.key === "unpinned")) {
         result.openTag = 'a href';
         result.closeTag = 'a';
       } else {
@@ -58,6 +62,5 @@ export default Ember.Object.extend({
     });
 
     return results;
-  }.property()
+  }
 });
-