Fix FF test

vaadin · Nov 27, 2019 · 86e41b7 · 86e41b7
1 parent b028a83
commit 86e41b7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/vaadin-context-menu.html b/src/vaadin-context-menu.html
@@ -412,6 +412,9 @@
 
             this._oldListenOn.style.webkitTouchCallout = '';
             this._oldListenOn.style.webkitUserSelect = '';
+            this._oldListenOn.style.MozUserSelect = '';
+            this._oldListenOn.style.msUserSelect = '';
+            this._oldListenOn.style.userSelect = '';
 
             this._oldListenOn = null;
             this._oldOpenOn = null;
@@ -428,7 +431,10 @@
         _setListenOnUserSelect(value) {
           // note: these styles don't seem to work in Firefox on iOS.
           this.listenOn.style.webkitTouchCallout = value;
-          this.listenOn.style.webkitUserSelect = value;
+          this.listenOn.style.webkitUserSelect = value; // Chrome, Safari
+          this.listenOn.style.MozUserSelect = value; // Firefox
+          this.listenOn.style.msUserSelect = value; // IE 10+
+          this.listenOn.style.userSelect = value;
         }
 
         _closeOnChanged(closeOn, oldCloseOn) {

diff --git a/test/overlay.html b/test/overlay.html
@@ -109,11 +109,18 @@
           it('should set `user-select` to `none` on opening', done => {
             listenOnce(overlay, 'vaadin-overlay-open', () => {
               expect(menu.opened).to.eql(true);
-              expect(getComputedStyle(menu).userSelect).to.equal('none');
+
+              const userSelect = getComputedStyle(menu).webkitUserSelect ||
+                getComputedStyle(menu).MozUserSelect ||
+                getComputedStyle(menu).msUserSelect ||
+                getComputedStyle(menu).userSelect;
+
+              expect(userSelect).to.equal('none');
               done();
             });
 
-            expect(getComputedStyle(menu).userSelect).to.not.equal('none');
+            ['webkitUserSelect', 'MozUserSelect', 'msUserSelect', 'userSelect'].forEach(prop =>
+              expect(getComputedStyle(menu)[prop]).not.to.equal('none'));
             contextmenu();
           });
 
@@ -124,7 +131,10 @@
               newTarget.textContent = 'New target';
               menu.listenOn.parentElement.appendChild(newTarget);
               menu.listenOn = newTarget;
-              expect(getComputedStyle(menu).userSelect).not.to.equal('none');
+
+              ['webkitUserSelect', 'MozUserSelect', 'msUserSelect', 'userSelect'].forEach(prop =>
+                expect(getComputedStyle(menu)[prop]).not.to.equal('none'));
+
               done();
             });