aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/src/util/index.js2
-rw-r--r--js/tests/unit/util/index.spec.js5
2 files changed, 5 insertions, 2 deletions
diff --git a/js/src/util/index.js b/js/src/util/index.js
index e268b0728..e9950c9e3 100644
--- a/js/src/util/index.js
+++ b/js/src/util/index.js
@@ -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 => {
diff --git a/js/tests/unit/util/index.spec.js b/js/tests/unit/util/index.spec.js
index 24921d730..41c1ce2b8 100644
--- a/js/tests/unit/util/index.spec.js
+++ b/js/tests/unit/util/index.spec.js
@@ -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 ', () => {