Skip to content

Commit 50ee371

Browse files
chriskrychochriskrycho
authored
Merge pull request #825 from ember-learn/bye-no-implicit-this
Eliminate all local `no-implicit-this` errors
2 parents 2257cad + f87cbb7 commit 50ee371

File tree

6 files changed

+50
-43
lines changed

6 files changed

+50
-43
lines changed

‎.template-lintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ module.exports = {
77
'attribute-indentation': false,
88
'no-unnecessary-concat': false,
99
'no-inline-styles': false,
10-
'no-implicit-this': false,
1110
'no-curly-component-invocation': false,
1211
'no-action': false,
1312
quotes: false,

‎app/templates/components/search-input/dropdown-result.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</div>
2929
</LinkTo>
3030
{{else}}
31-
<LinkTo @route="project-version.classes.class.methods.method" @models={{array this.module this.version result.class result.name}} @query={{hash anchor=this.result.name}} data-test-search-result>
31+
<LinkTo @route="project-version.classes.class.methods.method" @models={{array this.module this.version this.result.class this.result.name}} @query={{hash anchor=this.result.name}} data-test-search-result>
3232
<div class="algolia-docsearch-suggestion--subcategory-inline">
3333
{{!-- Sometimes hierarchy lvl1 is null, fall-back to lvl0 --}}
3434
{{#if this.result._highlightResult.hierarchy.lvl1}}

‎app/templates/project-version.hbs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,14 @@
2828
</PowerSelect>
2929
</div>
3030

31-
<TableOfContents @version={{this.urlVersion}} @classesIDs={{this.shownClassesIDs}} @moduleIDs={{this.shownModuleIDs}} @namespaceIDs={{this.shownNamespaceIDs}} @showPrivateClasses={{this.showPrivateClasses}} @isShowingNamespaces={{version-lt this.selectedProjectVersion.compactVersion "2.16"}} />
31+
<TableOfContents
32+
@version={{this.urlVersion}}
33+
@classesIDs={{this.shownClassesIDs}}
34+
@moduleIDs={{this.shownModuleIDs}}
35+
@namespaceIDs={{this.shownNamespaceIDs}}
36+
@showPrivateClasses={{this.showPrivateClasses}}
37+
@isShowingNamespaces={{version-lt this.selectedProjectVersion.compactVersion "2.16"}}
38+
/>
3239
</aside>
3340
<section class="content">
3441
{{outlet}}

‎tests/integration/components/api-index-filter-test.js

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -86,34 +86,34 @@ module('Integration | Component | api index filter', function (hooks) {
8686
};
8787

8888
await render(hbs`
89-
{{#api-index-filter model=model filterData=filterData as |myModel|}}
89+
{{#api-index-filter model=this.model filterData=this.filterData as |myModel|}}
9090
<section>
9191
Show:
9292
<label class="access-checkbox">
9393
<input id="inherited-toggle"
9494
type="checkbox"
95-
checked="{{filterData.showInherited}}"
95+
checked="{{this.filterData.showInherited}}"
9696
onchange={{action "updateFilter" "showInherited"}}>
9797
Inherited
9898
</label>
9999
<label class="access-checkbox">
100100
<input id=\"protected-toggle\"
101101
type=\"checkbox\"
102-
checked={{filterData.showProtected}}
102+
checked={{this.filterData.showProtected}}
103103
onchange={{action "updateFilter" \"showProtected\"}}>
104104
Protected
105105
</label>
106106
<label class="access-checkbox">
107107
<input id=\"private-toggle\"
108108
type=\"checkbox\"
109-
checked={{sectionData.showPrivate}}
109+
checked={{this.sectionData.showPrivate}}
110110
onchange={{action \"updateFilter\" \"showPrivate\"}}>
111111
Private
112112
</label>
113113
<label class="access-checkbox">
114114
<input id=\"deprecated-toggle\"
115115
type=\"checkbox\"
116-
checked=\"{{sectionData.showDeprecated}}\"
116+
checked=\"{{this.sectionData.showDeprecated}}\"
117117
onchange={{action \"updateFilter\" \"showDeprecated\"}}>
118118
</label>
119119
</section>
@@ -151,34 +151,34 @@ module('Integration | Component | api index filter', function (hooks) {
151151
};
152152

153153
await render(hbs`
154-
{{#api-index-filter model=model filterData=filterData updateFilter=(action "updateFilter") as |myModel|}}
154+
{{#api-index-filter model=this.model filterData=this.filterData updateFilter=(action "updateFilter") as |myModel|}}
155155
<section>
156156
Show:
157157
<label class="access-checkbox">
158158
<input id="inherited-toggle"
159159
type="checkbox"
160-
checked="{{filterData.showInherited}}"
160+
checked="{{this.filterData.showInherited}}"
161161
onchange={{action "updateFilter" "showInherited"}}>
162162
Inherited
163163
</label>
164164
<label class="access-checkbox">
165165
<input id=\"protected-toggle\"
166166
type=\"checkbox\"
167-
checked={{filterData.showProtected}}
167+
checked={{this.filterData.showProtected}}
168168
onchange={{action "updateFilter" \"showProtected\"}}>
169169
Protected
170170
</label>
171171
<label class="access-checkbox">
172172
<input id="private-toggle"
173173
type="checkbox"
174-
checked={{filterData.showPrivate}}
174+
checked={{this.filterData.showPrivate}}
175175
onchange={{action "updateFilter" "showPrivate"}}>
176176
Private
177177
</label>
178178
<label class="access-checkbox">
179179
<input id=\"deprecated-toggle\"
180180
type=\"checkbox\"
181-
checked=\"{{sectionData.showDeprecated}}\"
181+
checked=\"{{this.sectionData.showDeprecated}}\"
182182
onchange={{action \"updateFilter\" \"showDeprecated\"}}>
183183
</label>
184184
</section>
@@ -216,34 +216,34 @@ module('Integration | Component | api index filter', function (hooks) {
216216
};
217217

218218
await render(hbs`
219-
{{#api-index-filter model=model filterData=filterData as |myModel|}}
219+
{{#api-index-filter model=this.model filterData=this.filterData as |myModel|}}
220220
<section>
221221
Show:
222222
<label class="access-checkbox">
223223
<input id="inherited-toggle"
224224
type="checkbox"
225-
checked="{{filterData.showInherited}}"
225+
checked="{{this.filterData.showInherited}}"
226226
onchange={{action "updateFilter" "showInherited"}}>
227227
Inherited
228228
</label>
229229
<label class="access-checkbox">
230230
<input id=\"protected-toggle\"
231231
type=\"checkbox\"
232-
checked={{filterData.showProtected}}
232+
checked={{this.filterData.showProtected}}
233233
onchange={{action "updateFilter" \"showProtected\"}}>
234234
Protected
235235
</label>
236236
<label class="access-checkbox">
237237
<input id="private-toggle"
238238
type="checkbox"
239-
checked={{filterData.showPrivate}}
239+
checked={{this.filterData.showPrivate}}
240240
onchange={{action "updateFilter" "showPrivate"}}>
241241
Private
242242
</label>
243243
<label class="access-checkbox">
244244
<input id=\"deprecated-toggle\"
245245
type=\"checkbox\"
246-
checked=\"{{sectionData.showDeprecated}}\"
246+
checked=\"{{this.sectionData.showDeprecated}}\"
247247
onchange={{action \"updateFilter\" \"showDeprecated\"}}>
248248
</label>
249249
</section>
@@ -285,34 +285,34 @@ module('Integration | Component | api index filter', function (hooks) {
285285
};
286286

287287
await render(hbs`
288-
{{#api-index-filter model=model filterData=filterData as |myModel|}}
288+
{{#api-index-filter model=this.model filterData=this.filterData as |myModel|}}
289289
<section>
290290
Show:
291291
<label class="access-checkbox">
292292
<input id="inherited-toggle"
293293
type="checkbox"
294-
checked="{{filterData.showInherited}}"
294+
checked="{{this.filterData.showInherited}}"
295295
onchange={{action "updateFilter" "showInherited"}}>
296296
Inherited
297297
</label>
298298
<label class="access-checkbox">
299299
<input id="protected-toggle"
300300
type="checkbox"
301-
checked={{filterData.showProtected}}
301+
checked={{this.filterData.showProtected}}
302302
onchange={{action "updateFilter" "showProtected"}}>
303303
Protected
304304
</label>
305305
<label class="access-checkbox">
306306
<input id="private-toggle"
307307
type="checkbox"
308-
checked={{filterData.showPrivate}}
308+
checked={{this.filterData.showPrivate}}
309309
onchange={{action "updateFilter" "showPrivate"}}>
310310
Private
311311
</label>
312312
<label class="access-checkbox">
313313
<input id="deprecated-toggle"
314314
type="checkbox"
315-
checked="{{filterData.showDeprecated}}"
315+
checked="{{this.filterData.showDeprecated}}"
316316
onchange={{action "updateFilter" "showDeprecated"}}>
317317
</label>
318318
</section>
@@ -362,34 +362,34 @@ module('Integration | Component | api index filter', function (hooks) {
362362
};
363363

364364
await render(hbs`
365-
{{#api-index-filter model=model filterData=filterData as |myModel|}}
365+
{{#api-index-filter model=this.model filterData=this.filterData as |myModel|}}
366366
<section>
367367
Show:
368368
<label class="access-checkbox">
369369
<input id="inherited-toggle"
370370
type="checkbox"
371-
checked="{{filterData.showInherited}}"
371+
checked="{{this.filterData.showInherited}}"
372372
onchange={{action "updateFilter" "showInherited"}}>
373373
Inherited
374374
</label>
375375
<label class="access-checkbox">
376376
<input id="protected-toggle"
377377
type="checkbox"
378-
checked={{filterData.showProtected}}
378+
checked={{this.filterData.showProtected}}
379379
onchange={{action "updateFilter" "showProtected"}}>
380380
Protected
381381
</label>
382382
<label class="access-checkbox">
383383
<input id="private-toggle"
384384
type="checkbox"
385-
checked={{filterData.showPrivate}}
385+
checked={{this.filterData.showPrivate}}
386386
onchange={{action "updateFilter" "showPrivate"}}>
387387
Private
388388
</label>
389389
<label class="access-checkbox">
390390
<input id="deprecated-toggle"
391391
type="checkbox"
392-
checked="{{filterData.showDeprecated}}"
392+
checked="{{this.filterData.showDeprecated}}"
393393
onchange={{action "updateFilter" "showDeprecated"}}>
394394
</label>
395395
</section>
@@ -444,7 +444,7 @@ module('Integration | Component | api index filter', function (hooks) {
444444
this.set('filterData', filterData);
445445

446446
await render(hbs`
447-
{{#api-index-filter model=model filterData=filterData as |myModel|}}
447+
{{#api-index-filter model=this.model filterData=this.filterData as |myModel|}}
448448
<h2>Methods</h2>
449449
{{#each myModel.methods as |method|}}
450450
<p class=\"method-name\">{{method.name}}</p>

‎tests/integration/components/api-index-test.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ module('Integration | Component | api index', function (hooks) {
4545

4646
// Template block usage:
4747
await render(hbs`
48-
{{#api-index itemData=myModel as |sectionData|}}
48+
{{#api-index itemData=this.myModel as |sectionData|}}
4949
{{#each sectionData.sections as |section|}}
5050
<h2 class=\"api-index-section-title\">{{section.title}}</h2>
5151
{{#if section.items}}
@@ -123,7 +123,7 @@ module('Integration | Component | api index', function (hooks) {
123123

124124
// Template block usage:
125125
await render(hbs`
126-
{{#api-index itemData=myModel as |sectionData|}}
126+
{{#api-index itemData=this.myModel as |sectionData|}}
127127
{{#each sectionData.sections as |section|}}
128128
<h2 class=\"api-index-section-title\">{{section.title}}</h2>
129129
{{#if section.items}}
@@ -237,34 +237,34 @@ module('Integration | Component | api index', function (hooks) {
237237

238238
// Template block usage:
239239
await render(hbs`
240-
{{#api-index-filter model=myModel filterData=filterData as |filteredModel|}}
240+
{{#api-index-filter model=this.myModel filterData=this.filterData as |filteredModel|}}
241241
<section>
242242
Show:
243243
<label class="access-checkbox">
244244
<input id="inherited-toggle"
245245
type="checkbox"
246-
checked="{{filterData.showInherited}}"
246+
checked="{{this.filterData.showInherited}}"
247247
onchange={{action "updateFilter" "showInherited"}}>
248248
Inherited
249249
</label>
250250
<label class="access-checkbox">
251251
<input id=\"protected-toggle\"
252252
type=\"checkbox\"
253-
checked={{filterData.showProtected}}
253+
checked={{this.filterData.showProtected}}
254254
onchange={{action "updateFilter" \"showProtected\"}}>
255255
Protected
256256
</label>
257257
<label class="access-checkbox">
258258
<input id="private-toggle"
259259
type="checkbox"
260-
checked={{filterData.showPrivate}}
260+
checked={{this.filterData.showPrivate}}
261261
onchange={{action "updateFilter" "showPrivate"}}>
262262
Private
263263
</label>
264264
<label class="access-checkbox">
265265
<input id=\"deprecated-toggle\"
266266
type=\"checkbox\"
267-
checked=\"{{sectionData.showDeprecated}}\"
267+
checked=\"{{this.filterData.showDeprecated}}\"
268268
onchange={{action \"updateFilter\" \"showDeprecated\"}}>
269269
</label>
270270
</section>
@@ -383,34 +383,35 @@ module('Integration | Component | api index', function (hooks) {
383383
};
384384

385385
await render(hbs`
386-
{{#api-index-filter model=myModel filterData=filterData as |filteredModel|}}
386+
{{#api-index-filter model=this.myModel filterData=this.filterData as |filteredModel|}}
387387
<section>
388388
Show:
389389
<label class="access-checkbox">
390390
<input id="inherited-toggle"
391391
type="checkbox"
392-
checked="{{filterData.showInherited}}"
392+
checked="{{this.filterData.showInherited}}"
393393
onchange={{action "updateFilter" "showInherited"}}>
394394
Inherited
395395
</label>
396396
<label class="access-checkbox">
397397
<input id=\"protected-toggle\"
398398
type=\"checkbox\"
399-
checked={{filterData.showProtected}}
399+
checked={{this.filterData.showProtected}}
400400
onchange={{action "updateFilter" \"showProtected\"}}>
401401
Protected
402402
</label>
403403
<label class="access-checkbox">
404404
<input id="private-toggle"
405405
type="checkbox"
406-
checked={{filterData.showPrivate}}
406+
checked={{this.filterData.showPrivate}}
407407
onchange={{action "updateFilter" "showPrivate"}}>
408408
Private
409409
</label>
410+
{{! TODO: investigate this 'checked=': it looks wrong!}}
410411
<label class="access-checkbox">
411412
<input id=\"deprecated-toggle\"
412413
type=\"checkbox\"
413-
checked=\"{{sectionData.showDeprecated}}\"
414+
checked=\"{{this.sectionData.showDeprecated}}\"
414415
onchange={{action \"updateFilter\" \"showDeprecated\"}}>
415416
</label>
416417
</section>

‎tests/integration/helpers/is-latest-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module('helper:is-latest', function (hooks) {
1414
this.set('allVersions', versions);
1515

1616
await render(hbs`
17-
{{#if (is-latest version=version allVersions=allVersions)}}
17+
{{#if (is-latest version=this.version allVersions=this.allVersions)}}
1818
Hello World
1919
{{/if}}
2020
`);
@@ -26,7 +26,7 @@ module('helper:is-latest', function (hooks) {
2626
this.set('version', '3.1.0');
2727
this.set('allVersions', versions);
2828
await render(hbs`
29-
{{#if (is-latest version=version allVersions=allVersions)}}
29+
{{#if (is-latest version=this.version allVersions=this.allVersions)}}
3030
Hello World
3131
{{/if}}
3232
`);

0 commit comments

Comments
 (0)