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

[Pranam Lashkari (via logerrit)]

 cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js |    7 +++++++
 loleaflet/src/map/handler/Map.Scroll.js                             |    5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit fa410c77d33b5446af38fb55cc00eb053c0b4324
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Fri Sep 11 14:24:37 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Sep 15 15:47:44 2020 +0200

    scrolling: fixed multitouch horizontal scrolling
    
    Change-Id: I2b30be5bd2d96c4757cd4059a28fb08a702bc3ca
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102447
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/map/handler/Map.Scroll.js b/loleaflet/src/map/handler/Map.Scroll.js
index 9377f2d75..3f088cd23 100644
--- a/loleaflet/src/map/handler/Map.Scroll.js
+++ b/loleaflet/src/map/handler/Map.Scroll.js
@@ -48,7 +48,10 @@ L.Map.Scroll = L.Handler.extend({
 			this._timer = setTimeout(L.bind(this._performScroll, this), left);
 		}
 		else {
-			this._vertical = 1;
+			if (Math.abs(e.deltaX) > Math.abs(e.deltaY))
+				this._vertical = 0;
+			else
+				this._vertical = 1;
 			this._timer = setTimeout(L.bind(this._performScroll, this), left);
 		}
 
commit 03ce16f47cca5c7b7edce0cfc331ebf2c35e0d46
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Sep 15 13:17:44 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Sep 15 15:47:26 2020 +0200

    cypress: NC: fix writer page orientation test.
    
    Change-Id: I32e946388f06b3412d54c37dd556976dff362aa7
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102734
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
index 8c2d6e985..8e46bfb95 100644
--- a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
@@ -774,6 +774,13 @@ describe('Trigger hamburger menu options.', function() {
 		cy.get('.leaflet-tile-loaded[style=\'width: 256px; height: 256px; left: 1023px; top: 5px;\']')
 			.should('not.exist');
 
+		// Move the cursor to the right side of the document,
+		// so the new tile will be visible and loaded.
+		helper.typeIntoDocument('{end}');
+
+		cy.get('.blinking-cursor')
+			.should('be.visible');
+
 		openPageWizard();
 
 		helper.clickOnIdle('#paperorientation');