diff --git a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js
index 0ae94e46ef..c707c99b70 100644
--- a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js
+++ b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js
@@ -33,7 +33,7 @@ export default Component.extend({
     }
   },
 
-  _updateFormattedLogsFunc: function () {
+  _updateFormattedLogsFunc() {
     const logs = this.logs;
     if (logs.length === 0) {
       return;
diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
index 36d861779a..6910e15f87 100644
--- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
+++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js
@@ -114,7 +114,7 @@ export default Component.extend({
       this.fieldAdded(this.currentTargetName, name);
     },
 
-    toggleMaximize: function () {
+    toggleMaximize() {
       this.toggleProperty("maximized");
       next(() => this.appEvents.trigger("ace:resize"));
     },
diff --git a/app/assets/javascripts/admin/addon/components/color-input.js b/app/assets/javascripts/admin/addon/components/color-input.js
index 91aeaec6e0..c7a8da4b78 100644
--- a/app/assets/javascripts/admin/addon/components/color-input.js
+++ b/app/assets/javascripts/admin/addon/components/color-input.js
@@ -40,7 +40,7 @@ export default Component.extend({
   },
 
   @observes("hexValue", "brightnessValue", "valid")
-  hexValueChanged: function () {
+  hexValueChanged() {
     const hex = this.hexValue;
     let text = this.element.querySelector("input.hex-input");
 
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges-show.js b/app/assets/javascripts/admin/addon/controllers/admin-badges-show.js
index 5e1ed5bb21..33c8ad620b 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-badges-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-badges-show.js
@@ -70,7 +70,7 @@ export default Controller.extend(bufferedProperty("model"), {
   },
 
   @observes("model.id")
-  _resetSaving: function () {
+  _resetSaving() {
     this.set("saving", false);
     this.set("savingStatus", "");
   },
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js
index 37394fd17f..f4b6df1756 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js
@@ -15,11 +15,11 @@ export default Controller.extend({
   },
 
   actions: {
-    revert: function (color) {
+    revert(color) {
       color.revert();
     },
 
-    undo: function (color) {
+    undo(color) {
       color.undo();
     },
 
@@ -68,7 +68,7 @@ export default Controller.extend({
       });
     },
 
-    save: function () {
+    save() {
       this.model.save();
     },
 
@@ -76,7 +76,7 @@ export default Controller.extend({
       this.model.updateUserSelectable(this.get("model.user_selectable"));
     },
 
-    destroy: function () {
+    destroy() {
       const model = this.model;
       return bootbox.confirm(
         I18n.t("admin.customize.colors.delete_confirm"),
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js
index 2e1536d181..2c0cd18a70 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js
@@ -12,7 +12,7 @@ export default Controller.extend({
   editRouteName: "adminCustomizeThemes.edit",
   showRouteName: "adminCustomizeThemes.show",
 
-  setTargetName: function (name) {
+  setTargetName(name) {
     const target = this.get("model.targets").find((t) => t.name === name);
     this.set("currentTarget", target && target.id);
   },
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-index.js b/app/assets/javascripts/admin/addon/controllers/admin-email-index.js
index 18bfd4a8c4..cc808ad094 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-email-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-email-index.js
@@ -19,7 +19,7 @@ export default Controller.extend({
     @method testEmailAddressChanged
   **/
   @observes("testEmailAddress")
-  testEmailAddressChanged: function () {
+  testEmailAddressChanged() {
     this.set("sentTestEmail", false);
   },
 
@@ -29,7 +29,7 @@ export default Controller.extend({
 
       @method sendTestEmail
     **/
-    sendTestEmail: function () {
+    sendTestEmail() {
       this.setProperties({
         sendingEmail: true,
         sentTestEmail: false,
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js b/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js
index b11b397311..d4f354d321 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js
@@ -37,7 +37,7 @@ export default Controller.extend({
       textArea.remove();
     },
 
-    destroy: function (record) {
+    destroy(record) {
       return bootbox.confirm(
         I18n.t("admin.permalink.delete_confirm"),
         I18n.t("no_value"),
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-plugins.js b/app/assets/javascripts/admin/addon/controllers/admin-plugins.js
index d19c5584aa..54551537da 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-plugins.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-plugins.js
@@ -3,7 +3,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 
 export default Controller.extend({
   @discourseComputed
-  adminRoutes: function () {
+  adminRoutes() {
     return this.model
       .map((p) => {
         if (p.get("enabled")) {
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js
index d784c312ea..9461374085 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js
@@ -61,7 +61,7 @@ export default Controller.extend(GrantBadgeController, {
   },
 
   actions: {
-    expandGroup: function (userBadge) {
+    expandGroup(userBadge) {
       const model = this.model;
       model.set("expandedBadges", model.get("expandedBadges") || []);
       model.get("expandedBadges").pushObject(userBadge.badge.id);
diff --git a/app/assets/javascripts/admin/addon/models/email-settings.js b/app/assets/javascripts/admin/addon/models/email-settings.js
index f959df408f..aa4a245f00 100644
--- a/app/assets/javascripts/admin/addon/models/email-settings.js
+++ b/app/assets/javascripts/admin/addon/models/email-settings.js
@@ -4,7 +4,7 @@ import { ajax } from "discourse/lib/ajax";
 const EmailSettings = EmberObject.extend({});
 
 EmailSettings.reopenClass({
-  find: function () {
+  find() {
     return ajax("/admin/email.json").then(function (settings) {
       return EmailSettings.create(settings);
     });
diff --git a/app/assets/javascripts/admin/addon/models/permalink.js b/app/assets/javascripts/admin/addon/models/permalink.js
index f9ed524879..25a3c90e03 100644
--- a/app/assets/javascripts/admin/addon/models/permalink.js
+++ b/app/assets/javascripts/admin/addon/models/permalink.js
@@ -5,7 +5,7 @@ import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 
 const Permalink = EmberObject.extend({
-  save: function () {
+  save() {
     return ajax("/admin/permalinks.json", {
       type: "POST",
       data: {
@@ -17,16 +17,16 @@ const Permalink = EmberObject.extend({
   },
 
   @discourseComputed("category_id")
-  category: function (category_id) {
+  category(category_id) {
     return Category.findById(category_id);
   },
 
   @discourseComputed("external_url")
-  linkIsExternal: function (external_url) {
+  linkIsExternal(external_url) {
     return !DiscourseURL.isInternal(external_url);
   },
 
-  destroy: function () {
+  destroy() {
     return ajax("/admin/permalinks/" + this.id + ".json", {
       type: "DELETE",
     });
@@ -34,7 +34,7 @@ const Permalink = EmberObject.extend({
 });
 
 Permalink.reopenClass({
-  findAll: function (filter) {
+  findAll(filter) {
     return ajax("/admin/permalinks.json", { data: { filter } }).then(function (
       permalinks
     ) {
diff --git a/app/assets/javascripts/admin/addon/models/screened-email.js b/app/assets/javascripts/admin/addon/models/screened-email.js
index 857cca0d63..62e985949d 100644
--- a/app/assets/javascripts/admin/addon/models/screened-email.js
+++ b/app/assets/javascripts/admin/addon/models/screened-email.js
@@ -9,7 +9,7 @@ const ScreenedEmail = EmberObject.extend({
     return I18n.t("admin.logs.screened_actions." + action);
   },
 
-  clearBlock: function () {
+  clearBlock() {
     return ajax("/admin/logs/screened_emails/" + this.id, {
       type: "DELETE",
     });
@@ -17,7 +17,7 @@ const ScreenedEmail = EmberObject.extend({
 });
 
 ScreenedEmail.reopenClass({
-  findAll: function () {
+  findAll() {
     return ajax("/admin/logs/screened_emails.json").then(function (
       screened_emails
     ) {
diff --git a/app/assets/javascripts/admin/addon/models/screened-url.js b/app/assets/javascripts/admin/addon/models/screened-url.js
index f3769c7d2f..9a0d4e1b73 100644
--- a/app/assets/javascripts/admin/addon/models/screened-url.js
+++ b/app/assets/javascripts/admin/addon/models/screened-url.js
@@ -11,7 +11,7 @@ const ScreenedUrl = EmberObject.extend({
 });
 
 ScreenedUrl.reopenClass({
-  findAll: function () {
+  findAll() {
     return ajax("/admin/logs/screened_urls.json").then(function (
       screened_urls
     ) {
diff --git a/app/assets/javascripts/admin/addon/routes/admin-emojis.js b/app/assets/javascripts/admin/addon/routes/admin-emojis.js
index 5047bd6f82..6d5b1ee648 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-emojis.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-emojis.js
@@ -3,7 +3,7 @@ import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 
 export default DiscourseRoute.extend({
-  model: function () {
+  model() {
     return ajax("/admin/customize/emojis.json").then(function (emojis) {
       return emojis.map(function (emoji) {
         return EmberObject.create(emoji);
diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-index.js b/app/assets/javascripts/admin/addon/routes/admin-logs-index.js
index db287d0533..1fff3f4068 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-logs-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-logs-index.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
-  redirect: function () {
+  redirect() {
     this.transitionTo("adminLogs.staffActionLogs");
   },
 });
diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js
index 9f3841ee04..1778b561c7 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js
@@ -1,11 +1,11 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
-  renderTemplate: function () {
+  renderTemplate() {
     this.render("admin/templates/logs/screened-emails", { into: "adminLogs" });
   },
 
-  setupController: function () {
+  setupController() {
     return this.controllerFor("adminLogsScreenedEmails").show();
   },
 });
diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js
index 99677710ca..230cf85ceb 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js
@@ -1,11 +1,11 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
-  renderTemplate: function () {
+  renderTemplate() {
     this.render("admin/templates/logs/screened-urls", { into: "adminLogs" });
   },
 
-  setupController: function () {
+  setupController() {
     return this.controllerFor("adminLogsScreenedUrls").show();
   },
 });
diff --git a/app/assets/javascripts/admin/addon/routes/admin-user-fields.js b/app/assets/javascripts/admin/addon/routes/admin-user-fields.js
index 25e7eb0188..79c908af64 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-user-fields.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-user-fields.js
@@ -2,11 +2,11 @@ import DiscourseRoute from "discourse/routes/discourse";
 import UserField from "admin/models/user-field";
 
 export default DiscourseRoute.extend({
-  model: function () {
+  model() {
     return this.store.findAll("user-field");
   },
 
-  setupController: function (controller, model) {
+  setupController(controller, model) {
     controller.setProperties({ model, fieldTypes: UserField.fieldTypes() });
   },
 });
diff --git a/app/assets/javascripts/admin/addon/routes/admin-users-index.js b/app/assets/javascripts/admin/addon/routes/admin-users-index.js
index 90a3f8a271..02d9cce444 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-users-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-users-index.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
-  redirect: function () {
+  redirect() {
     this.transitionTo("adminUsersList");
   },
 });
diff --git a/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js b/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js
index e2e45b16a3..29ae18db79 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
-  beforeModel: function () {
+  beforeModel() {
     this.transitionTo("adminUsersList.show", "active");
   },
 });
diff --git a/app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js b/app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js
index dd4299c700..e67bc9938a 100644
--- a/app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js
+++ b/app/assets/javascripts/discourse-common/addon/utils/decorator-alias.js
@@ -11,7 +11,7 @@ export default function decoratorAlias(fn, errorMessage) {
           enumerable: desc.enumerable,
           configurable: desc.configurable,
           writable: desc.writable,
-          initializer: function () {
+          initializer() {
             let value = extractValue(desc);
             return fn.apply(null, params.concat(value));
           },
diff --git a/app/assets/javascripts/discourse-common/addon/utils/decorators.js b/app/assets/javascripts/discourse-common/addon/utils/decorators.js
index 4fad373bf8..a7f1d0a53d 100644
--- a/app/assets/javascripts/discourse-common/addon/utils/decorators.js
+++ b/app/assets/javascripts/discourse-common/addon/utils/decorators.js
@@ -50,7 +50,7 @@ export function readOnly(target, name, desc) {
     writable: false,
     enumerable: desc.enumerable,
     configurable: desc.configurable,
-    initializer: function () {
+    initializer() {
       let value = extractValue(desc);
       return value.readOnly();
     },
diff --git a/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js b/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js
index 3987adffa6..d871e454eb 100644
--- a/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js
+++ b/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js
@@ -6,7 +6,7 @@ export default function handleDescriptor(target, key, desc, params = []) {
     enumerable: desc.enumerable,
     configurable: desc.configurable,
     writeable: desc.writeable,
-    initializer: function () {
+    initializer() {
       let computedDescriptor;
 
       if (desc.writable) {
diff --git a/app/assets/javascripts/discourse-common/addon/utils/macro-alias.js b/app/assets/javascripts/discourse-common/addon/utils/macro-alias.js
index 5b66901872..ed60022e68 100644
--- a/app/assets/javascripts/discourse-common/addon/utils/macro-alias.js
+++ b/app/assets/javascripts/discourse-common/addon/utils/macro-alias.js
@@ -5,7 +5,7 @@ function handleDescriptor(target, property, desc, fn, params = []) {
     enumerable: desc.enumerable,
     configurable: desc.configurable,
     writable: desc.writable,
-    initializer: function () {
+    initializer() {
       return fn(...params);
     },
   };
diff --git a/app/assets/javascripts/discourse/app/components/basic-topic-list.js b/app/assets/javascripts/discourse/app/components/basic-topic-list.js
index 3343512568..9c948b50f2 100644
--- a/app/assets/javascripts/discourse/app/components/basic-topic-list.js
+++ b/app/assets/javascripts/discourse/app/components/basic-topic-list.js
@@ -19,7 +19,7 @@ export default Component.extend({
   },
 
   @observes("topicList.[]")
-  _topicListChanged: function () {
+  _topicListChanged() {
     this._initFromTopicList(this.topicList);
   },
 
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-tab.js b/app/assets/javascripts/discourse/app/components/edit-category-tab.js
index 45721b4370..e96720db36 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-tab.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-tab.js
@@ -39,7 +39,7 @@ export default Component.extend({
     });
   },
 
-  _addToCollection: function () {
+  _addToCollection() {
     this.panels.addObject(this.tabClassName);
   },
 
@@ -50,7 +50,7 @@ export default Component.extend({
   },
 
   actions: {
-    select: function () {
+    select() {
       this.set("selectedTab", this.tab);
 
       if (!this.newCategory) {
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js
index b4d8d7a721..b9125ebf1e 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js
@@ -8,7 +8,7 @@ export default buildCategoryPanel("topic-template", {
   showInsertLinkButton: false,
 
   @observes("activeTab")
-  _activeTabChanged: function () {
+  _activeTabChanged() {
     if (this.activeTab) {
       schedule("afterRender", () =>
         this.element.querySelector(".d-editor-input").focus()
diff --git a/app/assets/javascripts/discourse/app/components/highlight-search.js b/app/assets/javascripts/discourse/app/components/highlight-search.js
index b0f8cc5e9c..268bd2ca39 100644
--- a/app/assets/javascripts/discourse/app/components/highlight-search.js
+++ b/app/assets/javascripts/discourse/app/components/highlight-search.js
@@ -7,7 +7,7 @@ export default Component.extend({
 
   @on("didInsertElement")
   @observes("highlight")
-  _highlightOnInsert: function () {
+  _highlightOnInsert() {
     const term = this.highlight;
     highlightSearch(this.element, term);
   },
diff --git a/app/assets/javascripts/discourse/app/components/share-source.js b/app/assets/javascripts/discourse/app/components/share-source.js
index ae9f40730c..972ffe3249 100644
--- a/app/assets/javascripts/discourse/app/components/share-source.js
+++ b/app/assets/javascripts/discourse/app/components/share-source.js
@@ -1,8 +1,9 @@
 import Component from "@ember/component";
 export default Component.extend({
   tagName: "",
+
   actions: {
-    share: function (source) {
+    share(source) {
       this.action(source);
     },
   },
diff --git a/app/assets/javascripts/discourse/app/components/topic-list-item.js b/app/assets/javascripts/discourse/app/components/topic-list-item.js
index 9933e98880..0fcbbd38f1 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list-item.js
+++ b/app/assets/javascripts/discourse/app/components/topic-list-item.js
@@ -159,16 +159,16 @@ export default Component.extend({
     return classes.join(" ");
   },
 
-  hasLikes: function () {
+  hasLikes() {
     return this.get("topic.like_count") > 0;
   },
 
-  hasOpLikes: function () {
+  hasOpLikes() {
     return this.get("topic.op_like_count") > 0;
   },
 
   @discourseComputed
-  expandPinned: function () {
+  expandPinned() {
     const pinned = this.get("topic.pinned");
     if (!pinned) {
       return false;
diff --git a/app/assets/javascripts/discourse/app/components/track-selected.js b/app/assets/javascripts/discourse/app/components/track-selected.js
index 0a1f3b2b01..4b19781a7e 100644
--- a/app/assets/javascripts/discourse/app/components/track-selected.js
+++ b/app/assets/javascripts/discourse/app/components/track-selected.js
@@ -5,7 +5,7 @@ export default Component.extend({
   tagName: "span",
 
   @observes("selected")
-  selectionChanged: function () {
+  selectionChanged() {
     const selected = this.selected;
     const list = this.selectedList;
     const id = this.selectedId;
diff --git a/app/assets/javascripts/discourse/app/components/user-stream.js b/app/assets/javascripts/discourse/app/components/user-stream.js
index 0632ab424e..19473885b4 100644
--- a/app/assets/javascripts/discourse/app/components/user-stream.js
+++ b/app/assets/javascripts/discourse/app/components/user-stream.js
@@ -31,7 +31,7 @@ export default Component.extend(LoadMore, {
   classNames: ["user-stream"],
 
   @observes("stream.user.id")
-  _scrollTopOnModelChange: function () {
+  _scrollTopOnModelChange() {
     schedule("afterRender", () => $(document).scrollTop(0));
   },
 
diff --git a/app/assets/javascripts/discourse/app/controllers/create-account.js b/app/assets/javascripts/discourse/app/controllers/create-account.js
index b58957450d..02f78f0248 100644
--- a/app/assets/javascripts/discourse/app/controllers/create-account.js
+++ b/app/assets/javascripts/discourse/app/controllers/create-account.js
@@ -260,7 +260,7 @@ export default Controller.extend(
     },
 
     @observes("emailValidation", "accountEmail")
-    prefillUsername: function () {
+    prefillUsername() {
       if (this.prefilledUsername) {
         // If username field has been filled automatically, and email field just changed,
         // then remove the username.
diff --git a/app/assets/javascripts/discourse/app/controllers/discovery.js b/app/assets/javascripts/discourse/app/controllers/discovery.js
index 4a09895ece..354465da4e 100644
--- a/app/assets/javascripts/discourse/app/controllers/discovery.js
+++ b/app/assets/javascripts/discourse/app/controllers/discovery.js
@@ -23,7 +23,7 @@ export default Controller.extend({
   loadedAllItems: not("discoveryTopics.model.canLoadMore"),
 
   @observes("loadedAllItems")
-  _showFooter: function () {
+  _showFooter() {
     this.set("application.showFooter", this.loadedAllItems);
   },
 
diff --git a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
index 89fc587f9d..b31187f77c 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
@@ -77,7 +77,7 @@ addBulkButton("showTagTopics", "change_tags", {
   icon: "tag",
   class: "btn-default",
   enabledSetting: "tagging_enabled",
-  buttonVisible: function () {
+  buttonVisible() {
     return this.currentUser.staff;
   },
 });
@@ -85,7 +85,7 @@ addBulkButton("showAppendTagTopics", "append_tags", {
   icon: "tag",
   class: "btn-default",
   enabledSetting: "tagging_enabled",
-  buttonVisible: function () {
+  buttonVisible() {
     return this.currentUser.staff;
   },
 });
@@ -93,14 +93,14 @@ addBulkButton("removeTags", "remove_tags", {
   icon: "tag",
   class: "btn-default",
   enabledSetting: "tagging_enabled",
-  buttonVisible: function () {
+  buttonVisible() {
     return this.currentUser.staff;
   },
 });
 addBulkButton("deleteTopics", "delete", {
   icon: "trash-alt",
   class: "btn-danger delete-topics",
-  buttonVisible: function () {
+  buttonVisible() {
     return this.currentUser.staff;
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/user-activity.js b/app/assets/javascripts/discourse/app/controllers/user-activity.js
index d3725a9259..cb7277ea5c 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-activity.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-activity.js
@@ -13,7 +13,7 @@ export default Controller.extend({
   canDownloadPosts: alias("user.viewingSelf"),
 
   @observes("userActionType", "model.stream.itemsLoaded")
-  _showFooter: function () {
+  _showFooter() {
     let showFooter;
     if (this.userActionType) {
       const stat = (this.get("model.stats") || []).find(
diff --git a/app/assets/javascripts/discourse/app/controllers/user-posts.js b/app/assets/javascripts/discourse/app/controllers/user-posts.js
index b9f95617d9..457d56d42a 100644
--- a/app/assets/javascripts/discourse/app/controllers/user-posts.js
+++ b/app/assets/javascripts/discourse/app/controllers/user-posts.js
@@ -5,7 +5,7 @@ export default Controller.extend({
   application: controller(),
 
   @observes("model.canLoadMore")
-  _showFooter: function () {
+  _showFooter() {
     this.set("application.showFooter", !this.get("model.canLoadMore"));
   },
 });
diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js
index b1083d1486..ad16573155 100644
--- a/app/assets/javascripts/discourse/app/controllers/user.js
+++ b/app/assets/javascripts/discourse/app/controllers/user.js
@@ -233,14 +233,14 @@ export default Controller.extend(CanCheckEmails, {
             `${iconHTML("exclamation-triangle")} ` +
             I18n.t("admin.user.delete_and_block"),
           class: "btn btn-danger",
-          callback: function () {
+          callback() {
             performDestroy(true);
           },
         },
         {
           label: I18n.t("admin.user.delete_dont_block"),
           class: "btn btn-primary",
-          callback: function () {
+          callback() {
             performDestroy(false);
           },
         },
diff --git a/app/assets/javascripts/discourse/app/initializers/ember-events.js b/app/assets/javascripts/discourse/app/initializers/ember-events.js
index a359c0bb06..4696e81293 100644
--- a/app/assets/javascripts/discourse/app/initializers/ember-events.js
+++ b/app/assets/javascripts/discourse/app/initializers/ember-events.js
@@ -3,7 +3,7 @@ let initializedOnce = false;
 export default {
   name: "ember-events",
 
-  initialize: function () {
+  initialize() {
     // By default Ember listens to too many events. This tells it the only events
     // we're interested in. (it removes mousemove and touchmove)
     if (initializedOnce) {
diff --git a/app/assets/javascripts/discourse/app/initializers/logout.js b/app/assets/javascripts/discourse/app/initializers/logout.js
index cedb695a36..b66f3edf40 100644
--- a/app/assets/javascripts/discourse/app/initializers/logout.js
+++ b/app/assets/javascripts/discourse/app/initializers/logout.js
@@ -9,7 +9,7 @@ export default {
   name: "logout",
   after: "message-bus",
 
-  initialize: function (container) {
+  initialize(container) {
     const messageBus = container.lookup("message-bus:main");
 
     if (!messageBus) {
diff --git a/app/assets/javascripts/discourse/app/initializers/logs-notice.js b/app/assets/javascripts/discourse/app/initializers/logs-notice.js
index 164f507448..fed410eab0 100644
--- a/app/assets/javascripts/discourse/app/initializers/logs-notice.js
+++ b/app/assets/javascripts/discourse/app/initializers/logs-notice.js
@@ -6,7 +6,7 @@ export default {
   name: "logs-notice",
   after: "message-bus",
 
-  initialize: function (container) {
+  initialize(container) {
     if (initializedOnce) {
       return;
     }
diff --git a/app/assets/javascripts/discourse/app/initializers/sharing-sources.js b/app/assets/javascripts/discourse/app/initializers/sharing-sources.js
index e5770527e4..f2aa2763e5 100644
--- a/app/assets/javascripts/discourse/app/initializers/sharing-sources.js
+++ b/app/assets/javascripts/discourse/app/initializers/sharing-sources.js
@@ -4,13 +4,13 @@ import Sharing from "discourse/lib/sharing";
 export default {
   name: "sharing-sources",
 
-  initialize: function (container) {
+  initialize(container) {
     const siteSettings = container.lookup("site-settings:main");
 
     Sharing.addSource({
       id: "twitter",
       icon: "fab-twitter",
-      generateUrl: function (link, title, quote = "") {
+      generateUrl(link, title, quote = "") {
         const text = quote ? `"${quote}" -- ` : title;
         return `http://twitter.com/intent/tweet?url=${encodeURIComponent(
           link
@@ -25,7 +25,7 @@ export default {
       id: "facebook",
       icon: "fab-facebook",
       title: I18n.t("share.facebook"),
-      generateUrl: function (link, title, quote = "") {
+      generateUrl(link, title, quote = "") {
         const fb_url = siteSettings.facebook_app_id
           ? `https://www.facebook.com/dialog/share?app_id=${
               siteSettings.facebook_app_id
@@ -41,7 +41,7 @@ export default {
       id: "email",
       icon: "envelope",
       title: I18n.t("share.email"),
-      generateUrl: function (link, title, quote = "") {
+      generateUrl(link, title, quote = "") {
         const body = quote ? `${quote} \n\n ${link}` : link;
         return (
           "mailto:?to=&subject=" +
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 8375bd14ea..6b16d724d7 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -202,7 +202,7 @@ class PluginApi {
    *
    * ```
    * api.modifyClassStatic('controller:composer', {
-   *   superFinder: function() { return []; }
+   *   superFinder() { return []; }
    * });
    * ```
    **/
@@ -1036,7 +1036,7 @@ class PluginApi {
    * Example:
    *
    * api.addComposerUploadProcessor({action: 'myFileTransformation'}, {
-   *    myFileTransformation: function (data, options) {
+   *    myFileTransformation(data, options) {
    *      let p = new Promise((resolve, reject) => {
    *        let file = data.files[data.index];
    *        console.log(`Transforming ${file.name}`);
diff --git a/app/assets/javascripts/discourse/app/lib/sharing.js b/app/assets/javascripts/discourse/app/lib/sharing.js
index 3af11d064a..9f6faa1e7f 100644
--- a/app/assets/javascripts/discourse/app/lib/sharing.js
+++ b/app/assets/javascripts/discourse/app/lib/sharing.js
@@ -5,7 +5,6 @@
     import Sharing from 'discourse/lib/sharing';
 
     Sharing.addSource({
-
       // This id must be present in the `share_links` site setting too
       id: 'twitter',
 
@@ -15,12 +14,12 @@
       htmlIcon: '<img src="example.com/example.jpg">',
 
       // A callback for generating the remote link from the `link` and `title`
-      generateUrl: function(link, title) {
+      generateUrl(link, title) {
         return "http://twitter.com/intent/tweet?url=" + encodeURIComponent(link) + "&text=" + encodeURIComponent(title);
       },
 
       // If provided, handle by custom javascript rather than default url open
-      clickHandler: function(link, title){
+      clickHandler(link, title) {
         alert("Hello!")
       },
 
diff --git a/app/assets/javascripts/discourse/app/mixins/buffered-content.js b/app/assets/javascripts/discourse/app/mixins/buffered-content.js
index 92b44f16fa..2469f1d3a1 100644
--- a/app/assets/javascripts/discourse/app/mixins/buffered-content.js
+++ b/app/assets/javascripts/discourse/app/mixins/buffered-content.js
@@ -10,11 +10,11 @@ export function bufferedProperty(property) {
       });
     }),
 
-    rollbackBuffer: function () {
+    rollbackBuffer() {
       this.buffered.discardBufferedChanges();
     },
 
-    commitBuffer: function () {
+    commitBuffer() {
       this.buffered.applyBufferedChanges();
     },
   };
diff --git a/app/assets/javascripts/discourse/app/mixins/singleton.js b/app/assets/javascripts/discourse/app/mixins/singleton.js
index 7aabd44c35..71cf1531eb 100644
--- a/app/assets/javascripts/discourse/app/mixins/singleton.js
+++ b/app/assets/javascripts/discourse/app/mixins/singleton.js
@@ -36,8 +36,8 @@
     // Define your class and apply the Mixin
     Foot = EmberObject.extend({});
     Foot.reopenClass(Singleton, {
-      createCurrent: function() {
-        return Foot.create({toes: 5});
+      createCurrent() {
+        return Foot.create({ toes: 5 });
       }
     });
 
diff --git a/app/assets/javascripts/discourse/app/models/action-summary.js b/app/assets/javascripts/discourse/app/models/action-summary.js
index 6c76700a06..eea49a695a 100644
--- a/app/assets/javascripts/discourse/app/models/action-summary.js
+++ b/app/assets/javascripts/discourse/app/models/action-summary.js
@@ -7,7 +7,7 @@ export default RestModel.extend({
   canToggle: or("can_undo", "can_act"),
 
   // Remove it
-  removeAction: function () {
+  removeAction() {
     this.setProperties({
       acted: false,
       count: this.count - 1,
diff --git a/app/assets/javascripts/discourse/app/models/user-badge.js b/app/assets/javascripts/discourse/app/models/user-badge.js
index 5db71db768..0956323b4f 100644
--- a/app/assets/javascripts/discourse/app/models/user-badge.js
+++ b/app/assets/javascripts/discourse/app/models/user-badge.js
@@ -9,7 +9,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 
 const UserBadge = EmberObject.extend({
   @discourseComputed
-  postUrl: function () {
+  postUrl() {
     if (this.topic_title) {
       return "/t/-/" + this.topic_id + "/" + this.post_number;
     }
@@ -34,7 +34,7 @@ const UserBadge = EmberObject.extend({
 });
 
 UserBadge.reopenClass({
-  createFromJson: function (json) {
+  createFromJson(json) {
     // Create User objects.
     if (json.users === undefined) {
       json.users = [];
@@ -110,7 +110,7 @@ UserBadge.reopenClass({
     @param {Object} options
     @returns {Promise} a promise that resolves to an array of `UserBadge`.
   **/
-  findByUsername: function (username, options) {
+  findByUsername(username, options) {
     if (!username) {
       return Promise.resolve([]);
     }
@@ -130,7 +130,7 @@ UserBadge.reopenClass({
     @param {String} badgeId
     @returns {Promise} a promise that resolves to an array of `UserBadge`.
   **/
-  findByBadgeId: function (badgeId, options) {
+  findByBadgeId(badgeId, options) {
     if (!options) {
       options = {};
     }
@@ -151,7 +151,7 @@ UserBadge.reopenClass({
     @param {String} username username of the user to be granted the badge.
     @returns {Promise} a promise that resolves to an instance of `UserBadge`.
   **/
-  grant: function (badgeId, username, reason) {
+  grant(badgeId, username, reason) {
     return ajax("/user_badges", {
       type: "POST",
       data: {
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index b9b92bc0b2..2876dd604b 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -761,7 +761,7 @@ const User = RestModel.extend({
     return !this.siteSettings.enable_discourse_connect && canDeleteAccount;
   },
 
-  delete: function () {
+  delete() {
     if (this.can_delete_account) {
       return ajax(userPath(this.username + ".json"), {
         type: "DELETE",
diff --git a/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js b/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js
index d3f6dbe3c6..6ea41178c2 100644
--- a/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js
+++ b/app/assets/javascripts/discourse/app/pre-initializers/register-dom-templates.js
@@ -1,7 +1,7 @@
 export default {
   name: "register-discourse-dom-templates",
 
-  initialize: function () {
+  initialize() {
     $('script[type="text/x-handlebars"]').each(function () {
       let $this = $(this);
       let name = $this.attr("name") || $this.data("template-name");
diff --git a/app/assets/javascripts/discourse/app/raw-views/list/visited-line.js b/app/assets/javascripts/discourse/app/raw-views/list/visited-line.js
index 569137bd5b..be7a17ecc0 100644
--- a/app/assets/javascripts/discourse/app/raw-views/list/visited-line.js
+++ b/app/assets/javascripts/discourse/app/raw-views/list/visited-line.js
@@ -3,7 +3,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 
 export default EmberObject.extend({
   @discourseComputed
-  isLastVisited: function () {
+  isLastVisited() {
     return this.lastVisitedTopic === this.topic;
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/group-messages-index.js b/app/assets/javascripts/discourse/app/routes/group-messages-index.js
index 24b9813204..c5630cc108 100644
--- a/app/assets/javascripts/discourse/app/routes/group-messages-index.js
+++ b/app/assets/javascripts/discourse/app/routes/group-messages-index.js
@@ -1,6 +1,6 @@
 import Route from "@ember/routing/route";
 export default Route.extend({
-  beforeModel: function () {
+  beforeModel() {
     this.transitionTo("group.messages.inbox");
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/preferences-email.js b/app/assets/javascripts/discourse/app/routes/preferences-email.js
index 8e88c2687f..984a0e35c4 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences-email.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences-email.js
@@ -3,15 +3,15 @@ import RestrictedUserRoute from "discourse/routes/restricted-user";
 export default RestrictedUserRoute.extend({
   showFooter: true,
 
-  model: function () {
+  model() {
     return this.modelFor("user");
   },
 
-  renderTemplate: function () {
+  renderTemplate() {
     this.render({ into: "user" });
   },
 
-  setupController: function (controller, model) {
+  setupController(controller, model) {
     controller.reset();
     controller.setProperties({
       model,
@@ -20,14 +20,14 @@ export default RestrictedUserRoute.extend({
     });
   },
 
-  resetController: function (controller, isExiting) {
+  resetController(controller, isExiting) {
     if (isExiting) {
       controller.set("new", undefined);
     }
   },
 
   // A bit odd, but if we leave to /preferences we need to re-render that outlet
-  deactivate: function () {
+  deactivate() {
     this._super(...arguments);
     this.render("preferences", { into: "user", controller: "preferences" });
   },
diff --git a/app/assets/javascripts/discourse/app/routes/preferences-username.js b/app/assets/javascripts/discourse/app/routes/preferences-username.js
index 8caa51fad4..1bf9b425a7 100644
--- a/app/assets/javascripts/discourse/app/routes/preferences-username.js
+++ b/app/assets/javascripts/discourse/app/routes/preferences-username.js
@@ -3,21 +3,21 @@ import RestrictedUserRoute from "discourse/routes/restricted-user";
 export default RestrictedUserRoute.extend({
   showFooter: true,
 
-  model: function () {
+  model() {
     return this.modelFor("user");
   },
 
-  renderTemplate: function () {
+  renderTemplate() {
     return this.render({ into: "user" });
   },
 
   // A bit odd, but if we leave to /preferences we need to re-render that outlet
-  deactivate: function () {
+  deactivate() {
     this._super(...arguments);
     this.render("preferences", { into: "user", controller: "preferences" });
   },
 
-  setupController: function (controller, user) {
+  setupController(controller, user) {
     controller.setProperties({
       model: user,
       newUsername: user.get("username"),
diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-topics.js b/app/assets/javascripts/discourse/app/routes/user-activity-topics.js
index bea03cd389..c1bccb4509 100644
--- a/app/assets/javascripts/discourse/app/routes/user-activity-topics.js
+++ b/app/assets/javascripts/discourse/app/routes/user-activity-topics.js
@@ -6,7 +6,7 @@ import I18n from "I18n";
 export default UserTopicListRoute.extend({
   userActionType: UserAction.TYPES.topics,
 
-  model: function () {
+  model() {
     return this.store
       .findFiltered("topicList", {
         filter:
diff --git a/app/assets/javascripts/discourse/app/routes/user-invited-index.js b/app/assets/javascripts/discourse/app/routes/user-invited-index.js
index eb0b18df12..9859a43270 100644
--- a/app/assets/javascripts/discourse/app/routes/user-invited-index.js
+++ b/app/assets/javascripts/discourse/app/routes/user-invited-index.js
@@ -1,7 +1,7 @@
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default DiscourseRoute.extend({
-  beforeModel: function () {
+  beforeModel() {
     this.replaceWith("userInvited.show", "pending");
   },
 });
diff --git a/app/assets/javascripts/discourse/app/routes/user-private-messages.js b/app/assets/javascripts/discourse/app/routes/user-private-messages.js
index a80933010c..1e00226bb7 100644
--- a/app/assets/javascripts/discourse/app/routes/user-private-messages.js
+++ b/app/assets/javascripts/discourse/app/routes/user-private-messages.js
@@ -39,7 +39,7 @@ export default DiscourseRoute.extend({
       this.refresh();
     },
 
-    willTransition: function () {
+    willTransition() {
       this._super(...arguments);
       this.controllerFor("user").set("pmView", null);
       return true;
diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js
index 24547305e3..142e1bc669 100644
--- a/app/assets/javascripts/locales/i18n.js
+++ b/app/assets/javascripts/locales/i18n.js
@@ -6,7 +6,7 @@ I18n.defaultLocale = "en";
 
 // Set default pluralization rule
 I18n.pluralizationRules = {
-  en: function(n) {
+  en(n) {
     return n === 0 ? ["zero", "none", "other"] : n === 1 ? "one" : "other";
   }
 };
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
index c9d2c714a4..c196b935dd 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js
@@ -351,7 +351,7 @@ export function setup(helper) {
 
     ruler.push("code", {
       tag: "code",
-      replace: function (state, tagInfo, content) {
+      replace(state, tagInfo, content) {
         let token;
         token = state.push("fence", "code", 0);
         token.content = content;
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js
index 5ca653daaf..26dd393b1f 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js
@@ -168,7 +168,7 @@ export function setup(helper) {
 
     ruler.push("code", {
       tag: "code",
-      replace: function (state, tagInfo, content) {
+      replace(state, tagInfo, content) {
         let token;
         token = state.push("code_inline", "code", 0);
         token.content = content;
@@ -179,7 +179,7 @@ export function setup(helper) {
     const simpleUrlRegex = /^http[s]?:\/\//;
     ruler.push("url", {
       tag: "url",
-      wrap: function (startToken, endToken, tagInfo, content) {
+      wrap(startToken, endToken, tagInfo, content) {
         const url = (tagInfo.attrs["_default"] || content).trim();
 
         if (simpleUrlRegex.test(url)) {
@@ -212,7 +212,7 @@ export function setup(helper) {
 
     ruler.push("email", {
       tag: "email",
-      replace: function (state, tagInfo, content) {
+      replace(state, tagInfo, content) {
         let token;
         let email = tagInfo.attrs["_default"] || content;
 
@@ -232,7 +232,7 @@ export function setup(helper) {
 
     ruler.push("image", {
       tag: "img",
-      replace: function (state, tagInfo, content) {
+      replace(state, tagInfo, content) {
         let token = state.push("image", "img", 0);
         token.attrs = [
           ["src", content],
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
index a58bf5298f..f43fceec0d 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js
@@ -151,7 +151,7 @@ const rule = {
     state.push("bbcode_open", "blockquote", 1);
   },
 
-  after: function (state) {
+  after(state) {
     state.push("bbcode_close", "blockquote", -1);
     state.push("bbcode_close", "aside", -1);
   },
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js
index 5533b5fded..3a2ed4d7e1 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js
@@ -11,7 +11,7 @@ export function setup(helper) {
 
   // we need a custom callback for style handling
   helper.allowList({
-    custom: function (tag, attr, val) {
+    custom(tag, attr, val) {
       if (tag !== "th" && tag !== "td") {
         return false;
       }
diff --git a/plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js b/plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js
index debaacc72b..00bd6b670a 100644
--- a/plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js
+++ b/plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js
@@ -1,6 +1,6 @@
 const rule = {
   tag: "details",
-  before: function (state, tagInfo) {
+  before(state, tagInfo) {
     const attrs = tagInfo.attrs;
     state.push("bbcode_open", "details", 1);
     state.push("bbcode_open", "summary", 1);
@@ -11,7 +11,7 @@ const rule = {
     state.push("bbcode_close", "summary", -1);
   },
 
-  after: function (state) {
+  after(state) {
     state.push("bbcode_close", "details", -1);
   },
 };
diff --git a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js
index 061ccceaf9..543a8e67d9 100644
--- a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js
+++ b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js
@@ -107,14 +107,14 @@ function getTitle(tokens, startToken) {
 const rule = {
   tag: "poll",
 
-  before: function (state, tagInfo, raw) {
+  before(state, tagInfo, raw) {
     let token = state.push("text", "", 0);
     token.content = raw;
     token.bbcode_attrs = tagInfo.attrs;
     token.bbcode_type = "poll_open";
   },
 
-  after: function (state, openToken, raw) {
+  after(state, openToken, raw) {
     const titleTokens = getTitle(state.tokens, openToken);
     let items = getListItems(state.tokens, openToken);
 
diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js b/plugins/poll/assets/javascripts/widgets/discourse-poll.js
index 471f748d21..138f0b8b0c 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js
@@ -567,7 +567,7 @@ function pieChartConfig(data, labels, opts = {}) {
       plugins: {
         legend: {
           labels: {
-            generateLabels: function () {
+            generateLabels() {
               return labels.map((text, index) => {
                 return {
                   fillStyle: getColors(data.length)[index],