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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/apply_font_spec.js |   12 ++++++++++++
 loleaflet/src/control/Control.MobileWizard.js            |    4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 3a1cbc802747a91211a886aaa0b333e57128c2d1
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jan 31 14:18:09 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Feb 4 11:13:44 2020 +0100

    mobile: Remove character spacing item from mobile wizard.
    
    This item triggers the character dialog, which we should
    avoid on mobile. In a desktop LO, this item opens a drop
    down list, which seems to be not implemented in online yet.
    
    Change-Id: I56a584e6665184c4242cddc4e78ba849a150c711
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87771
    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/apply_font_spec.js b/cypress_test/integration_tests/mobile/apply_font_spec.js
index 13079b835..7c4722251 100644
--- a/cypress_test/integration_tests/mobile/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/apply_font_spec.js
@@ -273,5 +273,17 @@ describe('Apply font changes.', function() {
 		cy.get('#copy-paste-container p sub')
 			.should('exist');
 	});
+
+	it('Character spacing item is hidden.', function() {
+		// Check that mobile wizard is opened
+		cy.get('#SubScript')
+			.scrollIntoView()
+			.should('be.visible');
+
+		// Character spacing item triggers the character dialog
+		// So better to hide it.
+		cy.get('#Spacing')
+			.should('not.exist');
+	});
 });
 
diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index 92445e5a3..20fa0a306 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -351,7 +351,7 @@ L.Control.MobileWizard = L.Control.extend({
 			this._removeItems(deck, ['cellbordertype', 'borderlinestyle', 'borderlinecolor']);
 		}
 
-		this._removeItems(data, ['editcontour']);
+		this._removeItems(data, ['editcontour', 'spacingbar']);
 	},
 
 	_findItemByTypeRecursive: function(data, t) {
@@ -378,8 +378,8 @@ L.Control.MobileWizard = L.Control.extend({
 
 	_removeItems: function (data, items) {
 		if (data.children) {
-			var childRemoved = false;
 			for (var i = 0; i < data.children.length; i++) {
+				var childRemoved = false;
 				for (var j = 0; j < items.length; j++) {
 					if (data.children[i].id === items[j]) {
 						data.children.splice(i, 1);