[Libreoffice-commits] online.git: cypress_test/integration_tests loleaflet/src

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/writer/focus_spec.js |    7 ++++---
 loleaflet/src/map/handler/Map.TouchGesture.js              |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 7b4bf196d21f9cde807852b98164b00367ef1eb7
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Mar 16 10:29:30 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Mar 16 10:29:30 2020 +0100

    Revert "cypress: mobile: reenable a focus related test."
    
    This reverts commit 584e707ddb779fc909a98d03ae9488d6c3e39650.

diff --git a/cypress_test/integration_tests/mobile/writer/focus_spec.js b/cypress_test/integration_tests/mobile/writer/focus_spec.js
index 17153f33a..a0c385fc9 100644
--- a/cypress_test/integration_tests/mobile/writer/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/focus_spec.js
@@ -201,9 +201,10 @@ describe('Focus tests', function() {
 					.dblclick(posX, posY);
 			});
 
-		// Document grabs the focus
-		cy.document().its('activeElement.className')
-			.should('be.eq', 'clipboard');
+		// Document still has the focus
+		// TODO: Focus is inconsistent here.
+		//cy.document().its('activeElement.className')
+		//	.should('be.eq', 'clipboard');
 	});
 
 	it('Focus with hamburger menu.', function() {
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js b/loleaflet/src/map/handler/Map.TouchGesture.js
index 99ff04a9f..1fc7479c6 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -313,7 +313,7 @@ L.Map.TouchGesture = L.Handler.extend({
 		// by the double-tap and triple-tap handlers below.
 		// Note: Hammer has requireFailure() which supressses this call
 		// when multi-taps are detected. This isn't working for us.
-		if (e.tapCount > 1 && !L.Browser.cypressTest)
+		if (e.tapCount > 1)
 			return;
 
 		var point = e.pointers[0],