Skip to content

Commit a8f3867

Browse files
statikstatik
authored
Merge pull request #61 from johanrd/deprecate-property-fallback-lookup-no-implicit-this
Deprecate Property Fallback Lookup (no-implicit-this)
2 parents c36e339 + c2a4583 commit a8f3867

5 files changed

Lines changed: 671 additions & 793 deletions

File tree

‎addon/templates/components/ember-inline-edit.hbs‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,62 @@
11
{{#if (has-block-params)}}
22
{{yield (hash
33
editor=(component 'ember-inline-editor'
4-
shouldHide=isNotEditing
5-
value=(readonly value)
6-
field=field
7-
fieldWidth=fieldWidth
8-
showSaveButton=showSaveButton
9-
showCancelButton=showCancelButton
10-
saveLabel=saveLabel
11-
cancelLabel=cancelLabel
12-
editorClass=editorClass
13-
buttonContainerClass=buttonContainerClass
14-
saveButtonClass=saveButtonClass
15-
cancelButtonClass=cancelButtonClass
16-
hintLabel=hintLabel
17-
on-update=(action (mut value))
4+
shouldHide=this.isNotEditing
5+
value=(readonly this.value)
6+
field=this.field
7+
fieldWidth=this.fieldWidth
8+
showSaveButton=this.showSaveButton
9+
showCancelButton=this.showCancelButton
10+
saveLabel=this.saveLabel
11+
cancelLabel=this.cancelLabel
12+
editorClass=this.editorClass
13+
buttonContainerClass=this.buttonContainerClass
14+
saveButtonClass=this.saveButtonClass
15+
cancelButtonClass=this.cancelButtonClass
16+
hintLabel=this.hintLabel
17+
on-update=(action (mut this.value))
1818
on-save=(action "save")
1919
on-cancel=(action "cancel")
2020
)
2121

2222
editable=(component 'ember-inline-editable'
23-
shouldHide=isEditing
24-
value=(readonly value)
25-
placeholder=placeholder
26-
showEditButton=showEditButton
27-
editButtonClass=editButtonClass
23+
shouldHide=this.isEditing
24+
value=(readonly this.value)
25+
placeholder=this.placeholder
26+
showEditButton=this.showEditButton
27+
editButtonClass=this.editButtonClass
2828
on-edit=(action "startEditing")
2929
)
3030
)
31-
(action "save") (action "cancel")
31+
(action "save")
32+
(action "cancel")
3233
}}
3334
{{else}}
34-
{{#if isEditing}}
35+
{{#if this.isEditing}}
3536
{{ember-inline-editor
36-
value=(readonly value)
37-
field=field
38-
fieldWidth=fieldWidth
39-
showSaveButton=showSaveButton
40-
showCancelButton=showCancelButton
41-
saveLabel=saveLabel
42-
cancelLabel=cancelLabel
43-
editorClass=editorClass
44-
buttonContainerClass=buttonContainerClass
45-
saveButtonClass=saveButtonClass
46-
cancelButtonClass=cancelButtonClass
47-
hintLabel=hintLabel
48-
on-update=(action (mut value))
37+
value=(readonly this.value)
38+
field=this.field
39+
fieldWidth=this.fieldWidth
40+
showSaveButton=this.showSaveButton
41+
showCancelButton=this.showCancelButton
42+
saveLabel=this.saveLabel
43+
cancelLabel=this.cancelLabel
44+
editorClass=this.editorClass
45+
buttonContainerClass=this.buttonContainerClass
46+
saveButtonClass=this.saveButtonClass
47+
cancelButtonClass=this.cancelButtonClass
48+
hintLabel=this.hintLabel
49+
on-update=(action (mut this.value))
4950
on-save=(action "save")
5051
on-cancel=(action "cancel")
5152
}}
5253
{{else}}
5354
{{ember-inline-editable
54-
value=(readonly value)
55-
placeholder=placeholder
56-
editLabel=editLabel
57-
showEditButton=showEditButton
58-
editButtonClass=editButtonClass
55+
value=(readonly this.value)
56+
placeholder=this.placeholder
57+
editLabel=this.editLabel
58+
showEditButton=this.showEditButton
59+
editButtonClass=this.editButtonClass
5960
on-edit=(action "startEditing")
6061
}}
6162
{{/if}}

‎addon/templates/components/ember-inline-editable.hbs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{{#if (has-block)}}
22
{{yield}}
33
{{else}}
4-
{{#if valueIsEmpty}}
4+
{{#if this.valueIsEmpty}}
55
<span class="gray-text">
6-
{{placeholder}}
6+
{{this.placeholder}}
77
</span>
88
{{else}}
9-
{{value}}
9+
{{this.value}}
1010
{{/if}}
1111

12-
{{#if showEditButton}}
13-
<span onclick={{action attrs.on-edit}} class="ember-inline-edit-toggle-btn {{editButtonClass}}">
14-
{{editLabel}}
12+
{{#if this.showEditButton}}
13+
<span onclick={{action this.attrs.on-edit}} class="ember-inline-edit-toggle-btn {{this.editButtonClass}}">
14+
{{this.editLabel}}
1515
</span>
1616
{{/if}}
1717
{{/if}}

‎addon/templates/components/ember-inline-editor.hbs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
{{#if (has-block)}}
22
{{yield}}
33
{{else}}
4-
{{#if (in-arr textFields field)}}
4+
{{#if (in-arr this.textFields this.field)}}
55
<input
6-
type={{field}}
7-
value={{value}}
8-
class="ember-inline-edit-input {{editorClass}}"
9-
oninput={{action attrs.on-update value="target.value"}}
10-
style={{fieldWidth}} />
11-
{{else if (in-arr textAreaFields field)}}
6+
type={{this.field}}
7+
value={{this.value}}
8+
class="ember-inline-edit-input {{this.editorClass}}"
9+
oninput={{action this.attrs.on-update value="target.value"}}
10+
style={{this.fieldWidth}} />
11+
{{else if (in-arr this.textAreaFields this.field)}}
1212
<textarea
13-
value={{value}}
14-
class="ember-inline-edit-input {{editorClass}}"
15-
oninput={{action attrs.on-update value="target.value"}}>
13+
value={{this.value}}
14+
class="ember-inline-edit-input {{this.editorClass}}"
15+
oninput={{action this.attrs.on-update value="target.value"}}>
1616
</textarea>
1717
{{/if}}
1818
{{/if}}
1919

20-
<div class="ember-inline-button-container {{buttonContainerClass}}">
21-
{{#if showSaveButton}}
20+
<div class="ember-inline-button-container {{this.buttonContainerClass}}">
21+
{{#if this.showSaveButton}}
2222
<button
23-
{{action attrs.on-save bubbles=false}}
24-
class="ember-inline-edit-save {{saveButtonClass}}">
25-
{{saveLabel}}
23+
{{action this.attrs.on-save bubbles=false}}
24+
class="ember-inline-edit-save {{this.saveButtonClass}}">
25+
{{this.saveLabel}}
2626
</button>
2727
{{/if}}
2828

29-
{{#if showCancelButton}}
29+
{{#if this.showCancelButton}}
3030
<button
31-
{{action attrs.on-cancel bubbles=false}}
32-
class="ember-inline-edit-cancel {{cancelButtonClass}}">
33-
{{cancelLabel}}
31+
{{action this.attrs.on-cancel bubbles=false}}
32+
class="ember-inline-edit-cancel {{this.cancelButtonClass}}">
33+
{{this.cancelLabel}}
3434
</button>
3535
{{/if}}
3636
</div>
3737

38-
{{#if hintLabel}}
39-
<span class="hint">{{{hintLabel}}}</span>
38+
{{#if this.hintLabel}}
39+
<span class="hint">{{{this.hintLabel}}}</span>
4040
{{/if}}

‎package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"ember-cli-eslint": "^5.1.0",
3737
"ember-cli-github-pages": "^0.2.0",
3838
"ember-cli-inject-live-reload": "^1.4.1",
39-
"ember-cli-qunit": "^4.3.2",
39+
"ember-cli-qunit": "^4.4.0",
4040
"ember-cli-shims": "^1.2.0",
4141
"ember-cli-sri": "^2.1.0",
4242
"ember-cli-uglify": "^2.0.0",
@@ -45,7 +45,6 @@
4545
"ember-export-application-global": "^2.0.0",
4646
"ember-load-initializers": "^1.1.0",
4747
"ember-maybe-import-regenerator": "^0.1.6",
48-
"ember-native-dom-helpers": "^0.6.2",
4948
"ember-resolver": "^4.0.0",
5049
"ember-source": "~3.3.0",
5150
"ember-source-channel-url": "^1.0.1",

0 commit comments

Comments
 (0)