Skip to content

Commit 4f269cf

Browse files
onechiporenkoonechiporenko
committed
Fix template-lint issues
1 parent 533f50c commit 4f269cf

File tree

7 files changed

+74
-83
lines changed

7 files changed

+74
-83
lines changed

‎app/templates/components/modals-container/alert.hbs

+6-10
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
transitionDuration=options.transitionDuration
77
open=modalIsOpened
88
onSubmit=(action "confirm")
9-
onHide=(action "decline") as |modal|
10-
}}
9+
onHide=(action "decline")
10+
as |modal|}}
1111
{{#modal.header}}
1212
{{#if options.titleComponent}}
1313
{{component
1414
options.titleComponent
15-
options=options
16-
}}
15+
options=options}}
1716
{{else}}
1817
{{#bs-modal/header/title}}{{options.title}}{{/bs-modal/header/title}}
1918
{{/if}}
@@ -22,8 +21,7 @@
2221
{{#if options.bodyComponent}}
2322
{{component
2423
options.bodyComponent
25-
options=options
26-
}}
24+
options=options}}
2725
{{else}}
2826
<p>{{options.body}}</p>
2927
{{/if}}
@@ -33,8 +31,7 @@
3331
{{component
3432
options.footerComponent
3533
options=options
36-
confirm=(action modal.submit)
37-
}}
34+
confirm=(action modal.submit)}}
3835
{{else}}
3936
<p>{{options.footer}}</p>
4037
{{bs-button
@@ -44,8 +41,7 @@
4441
iconActive=options.confirmIconActive
4542
iconInactive=options.confirmIconInactive
4643
size=options.confirmButtonSize
47-
onClick=(action modal.submit)
48-
}}
44+
onClick=(action modal.submit)}}
4945
{{/if}}
5046
{{/modal.footer}}
5147
{{/bs-modal}}

‎app/templates/components/modals-container/check-confirm.hbs

+16-14
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
transitionDuration=options.transitionDuration
77
open=modalIsOpened
88
onSubmit=(action "confirm")
9-
onHide=(action "decline") as |modal|
10-
}}
9+
onHide=(action "decline")
10+
as |modal|}}
1111
{{#modal.header}}
1212
{{#if options.titleComponent}}
1313
{{component
1414
options.titleComponent
15-
options=options
16-
}}
15+
options=options}}
1716
{{else}}
1817
{{#bs-modal/header/title}}{{options.title}}{{/bs-modal/header/title}}
1918
{{/if}}
@@ -23,12 +22,18 @@
2322
{{component
2423
options.bodyComponent
2524
options=options
26-
updatePromptValue=(action "updatePromptValue")
27-
}}
25+
updatePromptValue=(action "updatePromptValue")}}
2826
{{else}}
27+
{{! template-lint-disable attribute-indentation }}
2928
<p>{{options.body}}</p>
30-
{{#bs-form model=this onSubmit=(action "confirm") as |form|}}
31-
{{form.element controlType="checkbox" property="promptValue" label=options.inputLabel}}
29+
{{#bs-form
30+
model=this
31+
onSubmit=(action "confirm")
32+
as |form|}}
33+
{{form.element
34+
controlType="checkbox"
35+
property="promptValue"
36+
label=options.inputLabel}}
3237
{{/bs-form}}
3338
{{/if}}
3439
{{/modal.body}}
@@ -39,8 +44,7 @@
3944
options=options
4045
confirmDisabled=confirmDisabled
4146
confirm=(action modal.submit)
42-
decline=(action modal.close)
43-
}}
47+
decline=(action modal.close)}}
4448
{{else}}
4549
<p>{{options.footer}}</p>
4650
{{bs-button
@@ -50,8 +54,7 @@
5054
iconActive=options.declineIconActive
5155
iconInactive=options.declineIconInactive
5256
size=options.declineButtonSize
53-
onClick=(action modal.close)
54-
}}
57+
onClick=(action modal.close)}}
5558
{{bs-button
5659
type=options.confirmButtonType
5760
disabled=confirmDisabled
@@ -60,8 +63,7 @@
6063
size=options.confirmButtonSize
6164
iconActive=options.confirmIconActive
6265
iconInactive=options.confirmIconInactive
63-
onClick=(action modal.submit)
64-
}}
66+
onClick=(action modal.submit)}}
6567
{{/if}}
6668
{{/modal.footer}}
6769
{{/bs-modal}}

‎app/templates/components/modals-container/confirm.hbs

+7-12
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
transitionDuration=options.transitionDuration
77
open=modalIsOpened
88
onSubmit=(action "confirm")
9-
onHide=(action "decline") as |modal|
10-
}}
9+
onHide=(action "decline")
10+
as |modal|}}
1111
{{#modal.header}}
1212
{{#if options.titleComponent}}
1313
{{component
1414
options.titleComponent
15-
options=options
16-
}}
15+
options=options}}
1716
{{else}}
1817
{{#bs-modal/header/title}}{{options.title}}{{/bs-modal/header/title}}
1918
{{/if}}
@@ -22,8 +21,7 @@
2221
{{#if options.bodyComponent}}
2322
{{component
2423
options.bodyComponent
25-
options=options
26-
}}
24+
options=options}}
2725
{{else}}
2826
<p>{{options.body}}</p>
2927
{{/if}}
@@ -34,8 +32,7 @@
3432
options.footerComponent
3533
options=options
3634
confirm=(action modal.submit)
37-
decline=(action modal.close)
38-
}}
35+
decline=(action modal.close)}}
3936
{{else}}
4037
<p>{{options.footer}}</p>
4138
{{bs-button
@@ -45,17 +42,15 @@
4542
iconActive=options.declineIconActive
4643
iconInactive=options.declineIconInactive
4744
size=options.declineButtonSize
48-
onClick=(action modal.close)
49-
}}
45+
onClick=(action modal.close)}}
5046
{{bs-button
5147
type=options.confirmButtonType
5248
defaultText=options.confirm
5349
active=options.confirmIsActive
5450
iconActive=options.confirmIconActive
5551
size=options.confirmButtonSize
5652
iconInactive=options.confirmIconInactive
57-
onClick=(action modal.submit)
58-
}}
53+
onClick=(action modal.submit)}}
5954
{{/if}}
6055
{{/modal.footer}}
6156
{{/bs-modal}}

‎app/templates/components/modals-container/process.hbs

+5-8
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
keyboard=false
99
backdropClose=false
1010
onSubmit=(action "confirm")
11-
onHide=(action "decline") as |modal|
12-
}}
11+
onHide=(action "decline")
12+
as |modal|}}
1313
{{#modal.header closeButton=false}}
1414
{{#if options.titleComponent}}
1515
{{component
1616
options.titleComponent
17-
options=options
18-
}}
17+
options=options}}
1918
{{else}}
2019
{{#bs-modal/header/title}}{{options.title}}{{/bs-modal/header/title}}
2120
{{/if}}
@@ -24,8 +23,7 @@
2423
{{#if options.bodyComponent}}
2524
{{component
2625
options.bodyComponent
27-
options=options
28-
}}
26+
options=options}}
2927
{{else}}
3028
<p>{{options.body}}</p>
3129
{{#if options.iconClass}}
@@ -37,8 +35,7 @@
3735
{{#if options.footerComponent}}
3836
{{component
3937
options.footerComponent
40-
options=options
41-
}}
38+
options=options}}
4239
{{/if}}
4340
{{/modal.footer}}
4441
{{/bs-modal}}

‎app/templates/components/modals-container/progress.hbs

+10-11
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
keyboard=false
99
backdropClose=false
1010
onSubmit=(action "confirm")
11-
onHide=(action "decline") as |modal|
12-
}}
11+
onHide=(action "decline")
12+
as |modal|}}
1313
{{#modal.header closeButton=false}}
1414
{{#if options.titleComponent}}
1515
{{component
1616
options.titleComponent
17-
options=options
18-
}}
17+
options=options}}
1918
{{else}}
2019
{{#bs-modal/header/title}}{{options.title}}{{/bs-modal/header/title}}
2120
{{/if}}
@@ -27,8 +26,7 @@
2726
options=options
2827
progress=progress
2928
done=done
30-
overall=promisesCount
31-
}}
29+
overall=promisesCount}}
3230
{{else}}
3331
<p>{{options.body}}</p>
3432
{{#if promisesCount}}
@@ -38,8 +36,7 @@
3836
showLabel=options.showLabel
3937
striped=options.striped
4038
animate=options.animate
41-
type=options.type
42-
}}
39+
type=options.type}}
4340
{{/bs-progress}}
4441
{{/if}}
4542
{{/if}}
@@ -48,11 +45,13 @@
4845
{{#if options.footerComponent}}
4946
{{component
5047
options.footerComponent
51-
options=options
52-
}}
48+
options=options}}
5349
{{else}}
5450
{{#if options.cancelable}}
55-
{{#bs-button onClick=(action "cancel") disabled=canceled}}{{options.cancel}}{{/bs-button}}
51+
{{bs-button
52+
onClick=(action "cancel")
53+
defaultText=options.cancel
54+
disabled=canceled}}
5655
{{/if}}
5756
{{/if}}
5857
{{/modal.footer}}

‎app/templates/components/modals-container/prompt-confirm.hbs

+15-14
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
transitionDuration=options.transitionDuration
77
open=modalIsOpened
88
onSubmit=(action "confirm")
9-
onHide=(action "decline") as |modal|
10-
}}
9+
onHide=(action "decline")
10+
as |modal|}}
1111
{{#modal.header}}
1212
{{#if options.titleComponent}}
1313
{{component
1414
options.titleComponent
15-
options=options
16-
}}
15+
options=options}}
1716
{{else}}
1817
{{#bs-modal/header/title title=options.title}}{{options.title}}{{/bs-modal/header/title}}
1918
{{/if}}
@@ -23,12 +22,17 @@
2322
{{component
2423
options.bodyComponent
2524
options=options
26-
updatePromptValue=(action "updatePromptValue")
27-
}}
25+
updatePromptValue=(action "updatePromptValue")}}
2826
{{else}}
27+
{{! template-lint-disable attribute-indentation }}
2928
<p>{{options.body}}</p>
30-
{{#bs-form model=this onSubmit=(action "confirm") as |form|}}
31-
{{form.element property="promptValue" label=options.inputLabel}}
29+
{{#bs-form
30+
model=this
31+
onSubmit=(action "confirm")
32+
as |form|}}
33+
{{form.element
34+
property="promptValue"
35+
label=options.inputLabel}}
3236
{{/bs-form}}
3337
{{/if}}
3438
{{/modal.body}}
@@ -39,8 +43,7 @@
3943
options=options
4044
confirmDisabled=confirmDisabled
4145
confirm=(action modal.submit)
42-
decline=(action modal.close)
43-
}}
46+
decline=(action modal.close)}}
4447
{{else}}
4548
<p>{{options.footer}}</p>
4649
{{bs-button
@@ -50,8 +53,7 @@
5053
iconActive=options.declineIconActive
5154
iconInactive=options.declineIconInactive
5255
size=options.declineButtonSize
53-
onClick=(action modal.close)
54-
}}
56+
onClick=(action modal.close)}}
5557
{{bs-button
5658
type=options.confirmButtonType
5759
defaultText=options.confirm
@@ -60,8 +62,7 @@
6062
iconActive=options.confirmIconActive
6163
iconInactive=options.confirmIconInactive
6264
size=options.confirmButtonSize
63-
onClick=(action modal.submit)
64-
}}
65+
onClick=(action modal.submit)}}
6566
{{/if}}
6667
{{/modal.footer}}
6768
{{/bs-modal}}

0 commit comments

Comments
 (0)