REFACTOR: tags mixin (#7533)

discourse · May 13, 2019 · 7326dde · 7326dde
1 parent b8db702
commit 7326dde
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/app/assets/javascripts/select-kit/mixins/tags.js.es6 b/app/assets/javascripts/select-kit/mixins/tags.js.es6
@@ -11,8 +11,6 @@ export default Ember.Mixin.create({
   },
 
   searchTags(url, data, callback) {
-    const self = this;
-
     this.startLoading();
 
     return ajax(Discourse.getURL(url), {
@@ -22,15 +20,11 @@ export default Ember.Mixin.create({
       data
     })
       .then(json => {
-        self.set("asyncContent", callback(self, json));
-        self.autoHighlight();
-      })
-      .catch(error => {
-        popupAjaxError(error);
+        this.set("asyncContent", callback(this, json));
+        this.autoHighlight();
       })
-      .finally(() => {
-        self.stopLoading();
-      });
+      .catch(error => popupAjaxError(error))
+      .finally(() => this.stopLoading());
   },
 
   validateCreate(term) {
@@ -63,6 +57,7 @@ export default Ember.Mixin.create({
     const inSelection = this.get("selection")
       .map(s => toLowerCaseOrUndefined(get(s, "value")))
       .includes(term);
+
     if (inCollection || inSelection) {
       return false;
     }
@@ -72,7 +67,7 @@ export default Ember.Mixin.create({
 
   createContentFromInput(input) {
     // See lib/discourse_tagging#clean_tag.
-    var content = input
+    let content = input
       .trim()
       .replace(/\s+/g, "-")
       .replace(/[\/\?#\[\]@!\$&'\(\)\*\+,;=\.%\\`^\s|\{\}"<>]+/g, "")