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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/apply_paragraph_properties_spec.js |    7 +++++++
 loleaflet/src/control/Control.MobileWizard.js                            |    4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 7dda26507ab34eef53866ac3a0c2fa4da471e8b0
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jan 31 15:08:21 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Feb 4 11:14:12 2020 +0100

    mobile: Merge these two lists of removable items.
    
    Change-Id: If302035e017663d82f4154078c7d516b63410842
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87773
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index d6077bc98..32a96e859 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -348,10 +348,8 @@ L.Control.MobileWizard = L.Control.extend({
 				deck.children[textIdx].children[0].children = moveContent.concat(deck.children[textIdx].children[0].children);
 				deck.children.splice(stylesIdx, 1); //remove the styles property
 			}
-			this._removeItems(deck, ['cellbordertype', 'borderlinestyle', 'borderlinecolor']);
+			this._removeItems(deck, ['cellbordertype', 'borderlinestyle', 'borderlinecolor', 'editcontour', 'spacingbar', 'linespacing']);
 		}
-
-		this._removeItems(data, ['editcontour', 'spacingbar', 'linespacing']);
 	},
 
 	_findItemByTypeRecursive: function(data, t) {
commit c3c12e6fdfeb47733bec42982568bffbf8106dd3
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jan 31 15:03:57 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Feb 4 11:14:03 2020 +0100

    mobile: Remove linespacing item from mobile wizard.
    
    In a desktop LO, this item opens a drop down list,
    which seems to be not implemented in online yet.
    
    Change-Id: Ia9d82cf9a058a43077043dc128dbbc16f18da83a
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87772
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/integration_tests/mobile/apply_paragraph_properties_spec.js b/cypress_test/integration_tests/mobile/apply_paragraph_properties_spec.js
index 3ebcfa3f9..87ad515ea 100644
--- a/cypress_test/integration_tests/mobile/apply_paragraph_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/apply_paragraph_properties_spec.js
@@ -411,4 +411,11 @@ describe('Apply paragraph properties.', function() {
 				expect(item[0].style['text-indent']).to.be.equal('0.04in');
 			});
 	});
+
+	it('Linespacing item is hidden.', function() {
+		// Linespacing item triggers a drop down menu in core
+		// which is not implemented in online yet.
+		cy.get('#LineSpacing')
+			.should('not.exist');
+	});
 });
diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index 20fa0a306..d6077bc98 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', 'spacingbar']);
+		this._removeItems(data, ['editcontour', 'spacingbar', 'linespacing']);
 	},
 
 	_findItemByTypeRecursive: function(data, t) {