Set outlineStyle instead of outline when preventing outline (#8917)

Leaflet · May 18, 2023 · 8602948 · 8602948
1 parent 830b424
commit 8602948
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/spec/suites/dom/DomUtilSpec.js b/spec/suites/dom/DomUtilSpec.js
@@ -415,22 +415,23 @@ describe('DomUtil', function () {
 	describe('#preventOutline, #restoreOutline', function () {
 		(L.Browser.ie ? it.skip : it)('prevent / restore outline for the element', function () {
 			var child = document.createElement('div');
-			el.appendChild(child);
+			var originalStyle = child.style.outlineStyle = 'dotted';
+
 			child.tabIndex = 0;
-			expect(child.style.outline).to.be.equal(child.style.outline);
+			el.appendChild(child);
+
 			L.DomUtil.preventOutline(child);
-			expect(child.style.outline).to.match(/(?:none)/);
+			expect(child.style.outlineStyle).to.eql('none');
 
-			//	Explicit #restoreOutline through direct call
-			expect(child.style.outline).to.match(/(?:none)/);
+			// Explicit #restoreOutline through direct call
 			L.DomUtil.restoreOutline(child);
-			expect(child.style.outline).to.be.equal(child.style.outline);
+			expect(child.style.outlineStyle).to.be.eql(originalStyle);
 
-			//	Implicit #restoreOutline test through simulation
+			// Implicit #restoreOutline test through simulation
 			L.DomUtil.preventOutline(child);
-			expect(child.style.outline).to.match(/(?:none)/);
+			expect(child.style.outlineStyle).to.eql('none');
 			happen.once(child, {type: 'keydown'});
-			expect(child.style.outline).to.be.equal(child.style.outline);
+			expect(child.style.outlineStyle).to.be.eql(originalStyle);
 		});
 	});
 });
diff --git a/src/dom/DomUtil.js b/src/dom/DomUtil.js
@@ -310,16 +310,16 @@ export function preventOutline(element) {
 	if (!element.style) { return; }
 	restoreOutline();
 	_outlineElement = element;
-	_outlineStyle = element.style.outline;
-	element.style.outline = 'none';
+	_outlineStyle = element.style.outlineStyle;
+	element.style.outlineStyle = 'none';
 	DomEvent.on(window, 'keydown', restoreOutline);
 }
 
 // @function restoreOutline()
 // Cancels the effects of a previous [`L.DomUtil.preventOutline`]().
 export function restoreOutline() {
 	if (!_outlineElement) { return; }
-	_outlineElement.style.outline = _outlineStyle;
+	_outlineElement.style.outlineStyle = _outlineStyle;
 	_outlineElement = undefined;
 	_outlineStyle = undefined;
 	DomEvent.off(window, 'keydown', restoreOutline);