strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

jsdialog: don't show empty expander name

Browse source 
Change-Id: Ie2d7f5b3073d6975c8c085a178d6617d62925e96
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
This commit is contained in:
Szymon Kłos 2020-12-02 13:56:56 +01:00 committed by Szymon Kłos
parent 7f03b6067f
commit 79ca0a82e2
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
loleaflet/src/control/Control.JSDialogBuilder.js
View file

@ -552,22 +552,31 @@ L.Control.JSDialogBuilder = L.Control.extend({
_expanderHandler: function(parentContainer, data, builder) {
if (data.children.length > 0) {
var expander = L.DomUtil.create('div', 'ui-expander ' + builder.options.cssClass, parentContainer);
expander.id = data.id;
var label = L.DomUtil.create('span', 'ui-expander-label ' + builder.options.cssClass, expander);
label.innerText = builder._cleanText(data.children[0].text);
if (data.children[0].text && data.children[0].text !== '') {
var expander = L.DomUtil.create('div', 'ui-expander ' + builder.options.cssClass, parentContainer);
expander.id = data.id;
var label = L.DomUtil.create('span', 'ui-expander-label ' + builder.options.cssClass, expander);
label.innerText = builder._cleanText(data.children[0].text);
if (data.children.length > 1)
$(label).addClass('expanded');
if (data.children.length > 1)
$(label).addClass('expanded');
$(expander).click(function () {
builder.callback('expander', 'toggle', data, null, builder);
});
$(expander).click(function () {
builder.callback('expander', 'toggle', data, null, builder);
});
}
var expanderChildren = L.DomUtil.create('div', 'ui-expander-content ' + builder.options.cssClass, parentContainer);
var children = [];
for (var i = 1; i < data.children.length; i++) {
var startPos = 1;
if (data.children[0].type === 'grid' ||
data.children[0].type === 'container') {
startPos = 0;
}
for (var i = startPos; i < data.children.length; i++) {
children.push(data.children[i]);
}
@ -669,6 +678,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
}
builder.build(frameChildren, children);
} else {
return builder._containerHandler(parentContainer, data, builder);
}
return false;