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

mert (via logerrit) logerrit at kemper.freedesktop.org
Tue Jan 28 21:39:01 UTC 2020


 loleaflet/src/control/Control.MobileWizard.js |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 0c91e668186fa40b41c823c90cd53b467051495f
Author:     mert <mert.tumer at collabora.com>
AuthorDate: Tue Jan 28 15:19:03 2020 +0300
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Jan 28 22:38:42 2020 +0100

    mobilewizard: Fix character properties
    
    This patch fixes non-showing character properties
    on calc, also a bit improved the related function
    in terms of performance.
    
    Change-Id: Iba3f32ec5322225dd0d34bb56173151c52156564
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87610
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index f455ad2ea..02b90407b 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -344,10 +344,9 @@ L.Control.MobileWizard = L.Control.extend({
 			var textIdx = this._findIdxInParentById(deck, textName);
 			if (stylesIdx >= 0 && textIdx >= 0)
 			{
-				var moveContent = deck.children[stylesIdx].children;
-				deck.children.splice(stylesIdx, 1); // remove
-				textIdx = this._findIdxInParentById(deck, textName); // re-lookup
-				deck.children[textIdx].children = moveContent.concat(deck.children[textIdx].children);
+				var moveContent = deck.children[stylesIdx].children[0].children;
+				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']);
 		}


More information about the Libreoffice-commits mailing list