Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix warnings for removed form element arguments disabled and readonly #1077

Merged
merged 1 commit into from
May 16, 2020
Merged

Fix warnings for removed form element arguments disabled and readonly #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions addon/components/bs-form/element.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,10 +653,10 @@ export default class FormElement extends FormGroup {
'showValidation',
'showModelValidation',
'isValidating',
'__disabled'
'_disabled'
)
get validation() {
if (!this.showValidation || !this.hasValidator || this.isValidating || this.disabled) {
if (!this.showValidation || !this.hasValidator || this.isValidating || this._disabled) {
return null;
} else if (this.showModelValidation) {
/* The display of model validation messages has been triggered */
Expand Down
4 changes: 2 additions & 2 deletions addon/templates/components/bs-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
formLayout=this.formLayout
horizontalLabelGridClass=this.horizontalLabelGridClass
showAllValidations=this.showAllValidations
disabled=this.disabled
readonly=this.readonly
_disabled=this.disabled
_readonly=this.readonly
onChange=this.elementChanged
_onChange=this.resetSubmissionState
)
Expand Down
4 changes: 2 additions & 2 deletions addon/templates/components/bs-form/element.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
id=this.formElementId
type=this.controlType
label=@label
disabled=@disabled
readonly=@readonly
disabled=this._disabled
readonly=this._readonly
required=@required
options=this.options
optionLabelPath=this.optionLabelPath
Expand Down