Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Use more safe check for 'isDisabled' helper #33385

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

Merged
merged 4 commits into from
Mar 17, 2021
Merged

Use more safe check for 'isDisabled' helper #33385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1369f7
initial
GeoSot Mar 16, 2021
a96bdfb
fix bundlewatch.config.js, fix typo
GeoSot Mar 16, 2021
cb77669
Create .bundlewatch.config.json
XhmikosR Mar 17, 2021
64ec195
Merge branch 'main' into gs-regression-for-is_disabled_helper
XhmikosR Mar 17, 2021
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
2 changes: 1 addition & 1 deletion .bundlewatch.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
},
{
"path": "./dist/js/bootstrap.min.js",
"maxSize": "16.25 kB"
"maxSize": "16.5 kB"
}
],
"ci": {
Expand Down
2 changes: 1 addition & 1 deletion js/src/util/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ const isDisabled = element => {
return element.disabled
}

return element.getAttribute('disabled') !== 'false'
return element.hasAttribute('disabled') && element.getAttribute('disabled') !== 'false'
}

const findShadowRoot = element => {
Expand Down
5 changes: 4 additions & 1 deletion js/tests/unit/util/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,16 +347,19 @@ describe('Util', () => {
expect(Util.isDisabled(div2)).toEqual(true)
})

it('should return false if the element has disabled attribute with "false" value', () => {
it('should return false if the element has disabled attribute with "false" value, or doesn\'t have attribute', () => {
fixtureEl.innerHTML = [
'<div>',
' <div id="element" disabled="false"></div>',
' <div id="element1" ></div>',
'</div>'
].join('')

const div = fixtureEl.querySelector('#element')
const div1 = fixtureEl.querySelector('#element1')

expect(Util.isDisabled(div)).toEqual(false)
expect(Util.isDisabled(div1)).toEqual(false)
})

it('should return false if the element is not disabled ', () => {
Expand Down