DEV: Update linting (#140)

discourse · Nov 20, 2024 · cac6557 · cac6557
1 parent 596e1f7
commit cac6557
Show file tree

Hide file tree

Showing 15 changed files with 302 additions and 311 deletions.
diff --git a/assets/javascripts/discourse/components/emoji-images.hbs b/assets/javascripts/discourse/components/emoji-images.hbs
@@ -1,9 +1,9 @@
-{{#if siteSettings.enable_emoji}}
-  <div title={{titleText}}>
-    {{#each emojiHTML as |html|}}
+{{#if this.siteSettings.enable_emoji}}
+  <div title={{this.titleText}}>
+    {{#each this.emojiHTML as |html|}}
       {{html-safe html}}
     {{/each}}
   </div>
 {{else}}
-  {{d-icon "birthday-cake" title=titleText}}
+  {{d-icon "birthday-cake" title=this.titleText}}
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/cakeday.hbs b/assets/javascripts/discourse/templates/cakeday.hbs
@@ -1,14 +1,14 @@
 <div class="container cakeday">
   <ul class="nav-pills">
-    {{#if cakedayEnabled}}
+    {{#if this.cakedayEnabled}}
       <li class="nav-item-anniversaries">
         <LinkTo @route="cakeday.anniversaries">
           {{i18n "anniversaries.title"}}
         </LinkTo>
       </li>
     {{/if}}
 
-    {{#if birthdayEnabled}}
+    {{#if this.birthdayEnabled}}
       <li class="nav-item-birthdays">
         <LinkTo @route="cakeday.birthdays">
           {{i18n "birthdays.title"}}

diff --git a/assets/javascripts/discourse/templates/cakeday/anniversaries/all.hbs b/assets/javascripts/discourse/templates/cakeday/anniversaries/all.hbs
@@ -2,18 +2,18 @@
   <div class="cakeday-months">
     <h2 class="cakeday-header">{{i18n "anniversaries.month.title"}}</h2>
     <ComboBox
-      @content={{months}}
-      @value={{month}}
+      @content={{this.months}}
+      @value={{this.month}}
       @valueAttribute="value"
       @none="cakeday.none"
     />
   </div>
 
-  <ConditionalLoadingSpinner @condition={{model.loading}}>
-    <UserInfoList @users={{model}}>
+  <ConditionalLoadingSpinner @condition={{this.model.loading}}>
+    <UserInfoList @users={{this.model}}>
       {{i18n "anniversaries.month.empty"}}
     </UserInfoList>
   </ConditionalLoadingSpinner>
 
-  <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+  <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
 </LoadMore>
diff --git a/assets/javascripts/discourse/templates/cakeday/anniversaries/today.hbs b/assets/javascripts/discourse/templates/cakeday/anniversaries/today.hbs
@@ -1,11 +1,11 @@
-<h2 class="cakeday-header">{{title}}</h2>
+<h2 class="cakeday-header">{{this.title}}</h2>
 
 <LoadMore @selector=".user-info" @action={{action "loadMore"}}>
-  <ConditionalLoadingSpinner @condition={{model.loading}}>
-    <UserInfoList @users={{model}}>
+  <ConditionalLoadingSpinner @condition={{this.model.loading}}>
+    <UserInfoList @users={{this.model}}>
       {{i18n "anniversaries.today.empty"}}
     </UserInfoList>
   </ConditionalLoadingSpinner>
 
-  <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+  <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
 </LoadMore>
diff --git a/assets/javascripts/discourse/templates/cakeday/anniversaries/tomorrow.hbs b/assets/javascripts/discourse/templates/cakeday/anniversaries/tomorrow.hbs
@@ -1,11 +1,11 @@
-<h2 class="cakeday-header">{{title}}</h2>
+<h2 class="cakeday-header">{{this.title}}</h2>
 
 <LoadMore @selector=".user-info" @action={{action "loadMore"}}>
-  <ConditionalLoadingSpinner @condition={{model.loading}}>
-    <UserInfoList @users={{model}}>
+  <ConditionalLoadingSpinner @condition={{this.model.loading}}>
+    <UserInfoList @users={{this.model}}>
       {{i18n "anniversaries.tomorrow.empty"}}
     </UserInfoList>
   </ConditionalLoadingSpinner>
 
-  <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+  <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
 </LoadMore>
diff --git a/assets/javascripts/discourse/templates/cakeday/anniversaries/upcoming.hbs b/assets/javascripts/discourse/templates/cakeday/anniversaries/upcoming.hbs
@@ -1,11 +1,11 @@
-<h2 class="cakeday-header">{{title}}</h2>
+<h2 class="cakeday-header">{{this.title}}</h2>
 
 <LoadMore @selector=".user-info" @action={{action "loadMore"}}>
-  <ConditionalLoadingSpinner @condition={{model.loading}}>
-    <UserInfoList @users={{model}}>
+  <ConditionalLoadingSpinner @condition={{this.model.loading}}>
+    <UserInfoList @users={{this.model}}>
       {{i18n "anniversaries.upcoming.empty"}}
     </UserInfoList>
   </ConditionalLoadingSpinner>
 
-  <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+  <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
 </LoadMore>
diff --git a/assets/javascripts/discourse/templates/cakeday/birthdays/all.hbs b/assets/javascripts/discourse/templates/cakeday/birthdays/all.hbs
@@ -2,18 +2,18 @@
   <div class="cakeday-months">
     <h2 class="cakeday-header">{{i18n "birthdays.month.title"}}</h2>
     <ComboBox
-      @content={{months}}
-      @value={{month}}
+      @content={{this.months}}
+      @value={{this.month}}
       @valueAttribute="value"
       @none="cakeday.none"
     />
   </div>
 
-  <ConditionalLoadingSpinner @condition={{model.loading}}>
-    <UserInfoList @users={{model}} @isBirthday={{true}}>
+  <ConditionalLoadingSpinner @condition={{this.model.loading}}>
+    <UserInfoList @users={{this.model}} @isBirthday={{true}}>
       {{i18n "birthdays.month.empty"}}
     </UserInfoList>
   </ConditionalLoadingSpinner>
 
-  <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+  <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
 </LoadMore>
diff --git a/assets/javascripts/discourse/templates/cakeday/birthdays/today.hbs b/assets/javascripts/discourse/templates/cakeday/birthdays/today.hbs
@@ -1,11 +1,11 @@
-<h2 class="cakeday-header">{{title}}</h2>
+<h2 class="cakeday-header">{{this.title}}</h2>
 
 <LoadMore @selector=".user-info" @action={{action "loadMore"}}>
-  <ConditionalLoadingSpinner @condition={{model.loading}}>
-    <UserInfoList @users={{model}} @isBirthday={{true}}>
+  <ConditionalLoadingSpinner @condition={{this.model.loading}}>
+    <UserInfoList @users={{this.model}} @isBirthday={{true}}>
       {{i18n "birthdays.today.empty"}}
     </UserInfoList>
   </ConditionalLoadingSpinner>
 
-  <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+  <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
 </LoadMore>
diff --git a/assets/javascripts/discourse/templates/cakeday/birthdays/tomorrow.hbs b/assets/javascripts/discourse/templates/cakeday/birthdays/tomorrow.hbs
@@ -1,11 +1,11 @@
-<h2 class="cakeday-header">{{title}}</h2>
+<h2 class="cakeday-header">{{this.title}}</h2>
 
 <LoadMore @selector=".user-info" @action={{action "loadMore"}}>
-  <ConditionalLoadingSpinner @condition={{model.loading}}>
-    <UserInfoList @users={{model}} @isBirthday={{true}}>
+  <ConditionalLoadingSpinner @condition={{this.model.loading}}>
+    <UserInfoList @users={{this.model}} @isBirthday={{true}}>
       {{i18n "birthdays.tomorrow.empty"}}
     </UserInfoList>
   </ConditionalLoadingSpinner>
 
-  <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+  <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
 </LoadMore>
diff --git a/assets/javascripts/discourse/templates/cakeday/birthdays/upcoming.hbs b/assets/javascripts/discourse/templates/cakeday/birthdays/upcoming.hbs
@@ -1,11 +1,11 @@
-<h2 class="cakeday-header">{{title}}</h2>
+<h2 class="cakeday-header">{{this.title}}</h2>
 
 <LoadMore @selector=".user-info" @action={{action "loadMore"}}>
-  <ConditionalLoadingSpinner @condition={{model.loading}}>
-    <UserInfoList @users={{model}} @isBirthday={{true}}>
+  <ConditionalLoadingSpinner @condition={{this.model.loading}}>
+    <UserInfoList @users={{this.model}} @isBirthday={{true}}>
       {{i18n "birthdays.upcoming.empty"}}
     </UserInfoList>
   </ConditionalLoadingSpinner>
 
-  <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+  <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
 </LoadMore>
diff --git a/assets/javascripts/discourse/templates/connectors/user-card-post-names/user-card-cakeday.hbs b/assets/javascripts/discourse/templates/connectors/user-card-post-names/user-card-cakeday.hbs
@@ -1,13 +1,16 @@
-{{#if siteSettings.cakeday_birthday_enabled}}
-  {{#if isBirthday}}
+{{#if this.siteSettings.cakeday_birthday_enabled}}
+  {{#if this.isBirthday}}
     <EmojiImages
-      @list={{siteSettings.cakeday_birthday_emoji}}
-      @title={{birthdayTitle}}
+      @list={{this.siteSettings.cakeday_birthday_emoji}}
+      @title={{this.birthdayTitle}}
     />
   {{/if}}
 {{/if}}
-{{#if siteSettings.cakeday_enabled}}
-  {{#if isCakeday}}
-    <EmojiImages @list={{siteSettings.cakeday_emoji}} @title={{cakedayTitle}} />
+{{#if this.siteSettings.cakeday_enabled}}
+  {{#if this.isCakeday}}
+    <EmojiImages
+      @list={{this.siteSettings.cakeday_emoji}}
+      @title={{this.cakedayTitle}}
+    />
   {{/if}}
 {{/if}}
diff --git a/...ripts/discourse/templates/connectors/user-custom-preferences/user-date-of-birth-input.hbs b/...ripts/discourse/templates/connectors/user-custom-preferences/user-date-of-birth-input.hbs
@@ -1,25 +1,25 @@
-{{#if siteSettings.cakeday_birthday_enabled}}
+{{#if this.siteSettings.cakeday_birthday_enabled}}
   <div class="control-group">
     <label class="control-label">{{i18n "user.date_of_birth.label"}}</label>
     <div class="controls">
       <ComboBox
-        @content={{months}}
-        @value={{month}}
+        @content={{this.months}}
+        @value={{this.month}}
         @valueAttribute="value"
         @valueProperty="value"
         @none="cakeday.none"
         @options={{hash clearable=true autoInsertNoneItem=false}}
-        @onChange={{action (mut month)}}
+        @onChange={{action (mut this.month)}}
       />
 
       <ComboBox
-        @content={{days}}
-        @value={{day}}
+        @content={{this.days}}
+        @value={{this.day}}
         @valueProperty={{null}}
         @nameProperty={{null}}
         @none="cakeday.none"
         @options={{hash clearable=true autoInsertNoneItem=false}}
-        @onChange={{action (mut day)}}
+        @onChange={{action (mut this.day)}}
       />
     </div>
   </div>

diff --git a/assets/javascripts/discourse/templates/connectors/user-post-names/user-cakeday.hbs b/assets/javascripts/discourse/templates/connectors/user-post-names/user-cakeday.hbs
@@ -1,13 +1,16 @@
-{{#if siteSettings.cakeday_birthday_enabled}}
-  {{#if isBirthday}}
+{{#if this.siteSettings.cakeday_birthday_enabled}}
+  {{#if this.isBirthday}}
     <EmojiImages
-      @list={{siteSettings.cakeday_birthday_emoji}}
-      @title={{birthdayTitle}}
+      @list={{this.siteSettings.cakeday_birthday_emoji}}
+      @title={{this.birthdayTitle}}
     />
   {{/if}}
 {{/if}}
-{{#if siteSettings.cakeday_enabled}}
-  {{#if isCakeday}}
-    <EmojiImages @list={{siteSettings.cakeday_emoji}} @title={{cakedayTitle}} />
+{{#if this.siteSettings.cakeday_enabled}}
+  {{#if this.isCakeday}}
+    <EmojiImages
+      @list={{this.siteSettings.cakeday_emoji}}
+      @title={{this.cakedayTitle}}
+    />
   {{/if}}
 {{/if}}
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "devDependencies": {
-    "@discourse/lint-configs": "2.0.1",
+    "@discourse/lint-configs": "2.2.0",
     "ember-template-lint": "6.0.0",
     "eslint": "9.14.0",
     "prettier": "2.8.8"