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

jsdialog: mark correct primary button

Browse source 
use deterministic querySelector to avoid usage of
button from the old window to remove

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I49f7b563666fad614b1f688e80ccb0cdc8d6dcb7
This commit is contained in:
Szymon Kłos 2022-12-12 18:03:41 +01:00 committed by Andras Timar
parent 5bc7f274a9
commit dd840148bb
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
browser/src/control/Control.JSDialog.js
View file

@ -283,7 +283,7 @@ L.Control.JSDialog = L.Control.extend({
}
builder.build(content, [data]);
var primaryBtn = L.DomUtil.get(defaultButtonId);
var primaryBtn = content.querySelector('#' + defaultButtonId);
if (primaryBtn)
L.DomUtil.addClass(primaryBtn, 'button-primary');
if (isAutofilter)
@ -425,9 +425,13 @@ L.Control.JSDialog = L.Control.extend({
// after some updates, eg. drawing areas window can be bigger than initially
// update position according to that with small delay
var initialPositionSetup = function (force) {
setupPosition(force);
that.updatePosition(container, posX, posY);
// styleOnly - don't change position
var initialPositionSetup = function (force, styleOnly) {
if (!styleOnly) {
setupPosition(force);
that.updatePosition(container, posX, posY);
}
container.style.visibility = '';
// setup initial focus and helper elements for closing popup
@ -537,8 +541,9 @@ L.Control.JSDialog = L.Control.extend({
dialogInfo.updatePos(false, new L.Point(data.posx, data.posy));
}
if (!dialogInfo.invalidated && dialogInfo.setupPosFunc) {
setTimeout(function () { dialogInfo.setupPosFunc(true); }, 100);
if (dialogInfo.setupPosFunc) {
var styleOnly = dialogInfo.invalidated === true;
setTimeout(function () { dialogInfo.setupPosFunc(!styleOnly, styleOnly); }, 100);
dialogInfo.invalidated = true;
}
},