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

mobilewizard: fix number format doesn't update properly

Browse source 
Change-Id: I852dd79d9658f676e86b22cb1cb145264c9de2fe
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92762
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
This commit is contained in:
mert 2020-04-23 14:56:26 +03:00 committed by Andras Timar
parent def2368547
commit d9cbd9d6f6
2 changed files with 64 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -252,33 +252,20 @@ L.Control.JSDialogBuilder = L.Control.extend({
return false;
},
_updateListBox: function(builder, contentDiv, contentNode, sectionTitle, data, state) {
if ($(sectionTitle).find('.entry-value')[0])
sectionTitle = $($(sectionTitle).find('.entry-value')).get(0);
else
sectionTitle = $(sectionTitle).find('.ui-header-left').find('span')[0];
_updateListBox: function(builder, sectionTitle, data, state) {
if (!sectionTitle)
return;
$(contentDiv).find('.selected').removeClass('selected');
var hasChildren = $(contentDiv).children().length > 0 && contentNode.children && contentNode.children.length > 0;
var updateBy = builder._getListBoxUpdateType(data.id);
if (updateBy === 'index') {
if (updateBy === 'index')
sectionTitle.innerHTML = data.entries[state];
data.selectedEntries[0] = state;
contentDiv.title = data.entries[state];
if (hasChildren) {
$($(contentDiv).children().get(state)).addClass('selected');
}
} else if (updateBy === 'value') {
else if (updateBy === 'value')
sectionTitle.innerHTML = state;
if (hasChildren) {
$(contentDiv).find('p').filter(function() {
return $(this).text() === state;
}).addClass('selected');
}
if (builder.refreshSidebar) {
builder.wizard._refreshSidebar(0);
builder.refreshSidebar = false;
}
},
@ -301,6 +288,13 @@ L.Control.JSDialogBuilder = L.Control.extend({
}
var titleSpan = L.DomUtil.create('span', titleClass, leftDiv);
if (!valueNode && data.command) {
var items = builder.map['stateChangeHandler'];
var val = items.getItemValue(data.command);
if (val)
valueNode = L.DomUtil.create('div', '', null);
}
var rightDiv = L.DomUtil.create('div', 'ui-header-right', sectionTitle);
if (valueNode) {
var valueDiv = L.DomUtil.create('div', 'entry-value', rightDiv);
@ -310,6 +304,34 @@ L.Control.JSDialogBuilder = L.Control.extend({
var arrowSpan = L.DomUtil.create('span', 'sub-menu-arrow', rightDiv);
arrowSpan.innerHTML = '>';
var updateFunction = function(titleSpan) {
var state = null;
if (data.id)
state = builder._getUnoStateForItemId(data.id, builder);
if (state && builder._getListBoxUpdateType(data.id)) {
titleSpan.innerHTML = data.text;
builder._updateListBox(builder, valueNode?valueDiv:titleSpan, data, state);
} else if (state) {
titleSpan.innerHTML = state;
} else {
titleSpan.innerHTML = data.text;
}
};
updateCallback ? updateCallback(titleSpan) : updateFunction(titleSpan);
builder.map.on('commandstatechanged', function(e) {
if (e.commandName === data.command || e.commandName === builder._mapWindowIdToUnoCommand(data.id))
{
if (updateCallback)
updateCallback(titleSpan);
else
updateFunction(titleSpan);
}
}, this);
var contentDiv = L.DomUtil.create('div', 'ui-content level-' + builder._currentDepth + ' mobile-wizard', parentContainer);
contentDiv.title = data.text;
@ -332,33 +354,6 @@ L.Control.JSDialogBuilder = L.Control.extend({
}
else
$(sectionTitle).hide();
var updateFunction = function(titleSpan) {
var state = null;
if (data.id)
state = builder._getUnoStateForItemId(data.id, builder);
if (builder._getListBoxUpdateType(data.id)) {
builder._updateListBox(builder, contentDiv, contentNode, sectionTitle, data, state);
} else if (state) {
titleSpan.innerHTML = state;
} else {
titleSpan.innerHTML = data.text;
}
};
updateCallback ? updateCallback(titleSpan) : updateFunction(titleSpan);
builder.map.on('commandstatechanged', function(e) {
if (e.commandName === data.command || e.commandName === builder._mapWindowIdToUnoCommand(data.id))
{
if (updateCallback)
updateCallback(titleSpan);
else
updateFunction(titleSpan);
}
}, this);
},
_calcFunctionEntry: function(parentContainer, data, contentNode, builder) {
@ -1244,6 +1239,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
L.DomUtil.addClass(fixedtext, data.style);
$(fixedtext).click(function () {
builder.refreshSidebar = true;
builder.callback('combobox', 'selected', fixedtext.parent, data.pos + ';' + fixedtext.innerHTML, builder);
});
},
@ -1349,6 +1345,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
}
$(div).click(function () {
builder.refreshSidebar = true;
builder.callback('toolbutton', 'click', button, data.command, builder);
});

23
loleaflet/src/control/Control.MobileWizard.js
View file

@ -266,21 +266,36 @@ L.Control.MobileWizard = L.Control.extend({
if (this._tabs && path && path.length)
this._selectTab(path[0]);
var _path = [];
var goBack = false;
for (var index in path) {
$('[title=\'' + path[index] + '\'').prev().trigger('click', {animate: false});
var elem = $('[title=\'' + path[index] + '\'').prev();
if (elem.length) {
$(elem).trigger('click', {animate: false});
_path.push(path[index]);
}
else
goBack = true;
}
this._currentPath = path;
if (goBack) {
this._currentScrollPosition = 0;
$('#mobile-wizard-content').animate({ scrollTop: 0 }, 0);
}
this._currentPath = _path;
},
_refreshSidebar: function() {
_refreshSidebar: function(ms) {
ms = ms !== undefined ? ms : 400;
var map = this.map;
setTimeout(function () {
var message = 'dialogevent ' +
(window.sidebarId !== undefined ? window.sidebarId : -1) +
' {\"id\":\"-1\"}';
map._socket.sendMessage(message);
}, 400);
}, ms);
},
_updateMapSize: function() {