pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix bug 74837' (#301) from fix/bug-74837 into fix/fix-bugs

Browse Source
This commit is contained in:
Maxim Kadushkin
2025-06-16 18:49:22 +00:00
parent 1361db264e d5660baffc
commit 29b9174e26
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
common/loginpage/src/about-dialog.js
View File

@ -3,7 +3,7 @@ window.AboutDialog = function(params) {
!params && (params = {});
let $el, $dialogTitle, $dialogBody;
let $el, $dialogTitle, $dialogBody, pendingBody;
const events = {close: params.onclose};
const _template = `
@ -21,21 +21,28 @@ window.AboutDialog = function(params) {
};
function close(opts) {
$el.remove();
$el.get(0).close();
if (events.close) {
events.close(opts);
}
}
function setBody(data) {
$dialogBody.html(data);
}
return {
setBody: function(data) {
$dialogBody.html(data);
if ($dialogBody) {
$dialogBody.html(data);
} else {
pendingBody = data;
}
},
show: function () {
if ($el && $el.length) {
const dlg = $el.get(0);
if (!dlg.open) dlg.showModal();
return;
}
$el = $('#placeholder').append(_template).find('.dlg-about');
$el.width(576);
@ -44,6 +51,10 @@ window.AboutDialog = function(params) {
$dialogTitle.find('.tool.close').bind('click', onCloseClick);
$dialogBody = $el.find('.body');
if (pendingBody) {
$dialogBody.html(pendingBody);
pendingBody = null;
}
$el.get(0).showModal();
$el.addClass('scaled');

2
common/loginpage/src/panelabout.js
View File

@ -155,6 +155,7 @@
this.view.$menuitem && this.view.$menuitem.removeClass('extra');
this.view.$body = $(this.view.paneltemplate(args));
this.view.$dialog = new AboutDialog();
this.view.$dialog.setBody(this.view.$body)
} else {
if ( !!args.opts && !!args.opts.edition ) {
$('#idx-ver-edition').html(args.opts.edition);
@ -277,7 +278,6 @@
const onPanelShow = function(panel) {
if (panel === this.action) {
this.view.$dialog.show();
this.view.$dialog.setBody(this.view.$body);
}
}