loleaflet/src/control/Control.MobileWizard.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 227b11488ac2c2b00ea1f10f2008d28126114ed4
Author: mert <mert.tu...@collabora.com>
AuthorDate: Thu Jan 23 20:19:52 2020 +0300
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Tue Jan 28 22:36:48 2020 +0100
mobilewizard: remove some problematic items
Under Cell Appearance properties, cellbordertype, borderlinestyle,
borderlinecolor items are removed due to not working properly.
Change-Id: I56fd71355051a0b1dc20f6dc86090e2f35520b3a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87608
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/loleaflet/src/control/Control.MobileWizard.js
b/loleaflet/src/control/Control.MobileWizard.js
index ea7a7c557..f455ad2ea 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -349,6 +349,7 @@ L.Control.MobileWizard = L.Control.extend({
textIdx = this._findIdxInParentById(deck,
textName); // re-lookup
deck.children[textIdx].children =
moveContent.concat(deck.children[textIdx].children);
}
+ this._removeItems(deck, ['cellbordertype',
'borderlinestyle', 'borderlinecolor']);
}
this._removeItems(data, ['editcontour']);
@@ -384,14 +385,12 @@ L.Control.MobileWizard = L.Control.extend({
if (data.children[i].id === items[j]) {
data.children.splice(i, 1);
childRemoved = true;
- continue;
}
}
- if (childRemoved === true) {
+ if (childRemoved && i > 0)
i = i - 1;
- } else {
+ if (data.children[i])
this._removeItems(data.children[i],
items);
- }
}
}
},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
