From 1f33633d96bdaf848965bdcfea1e185c2fb969b9 Mon Sep 17 00:00:00 2001 From: Dmitry-Ilyushechkin Date: Mon, 9 Jun 2025 22:14:46 +0300 Subject: [PATCH 1/2] fix bug 74837 --- common/loginpage/src/panelabout.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/loginpage/src/panelabout.js b/common/loginpage/src/panelabout.js index 302a1e57f..d6abe4779 100644 --- a/common/loginpage/src/panelabout.js +++ b/common/loginpage/src/panelabout.js @@ -254,7 +254,7 @@ const $button = $('#idx-update-btnaction', this.view.$body); if ( info.button.text ) { $button.text(info.button.text); - $button.data("action", info.button.action); + $button.attr("data-action", info.button.action); } if ( info.button.lock ) { @@ -294,6 +294,11 @@ CommonEvents.on('panel:show', onPanelShow.bind(this)); + $(document).off('click', '#idx-update-btnaction').on('click', '#idx-update-btnaction', function() { + const action = $(this).attr('data-action'); + if (action) sdk.execCommand('updates:action', action); + }); + return this; }, onfeaturesavailable: _on_features_avalable From d5660baffc399cdde690bc1809e0aa0e161ee2a8 Mon Sep 17 00:00:00 2001 From: Dmitry-Ilyushechkin Date: Fri, 13 Jun 2025 15:38:05 +0300 Subject: [PATCH 2/2] fix bug --- common/loginpage/src/about-dialog.js | 23 +++++++++++++++++------ common/loginpage/src/panelabout.js | 9 ++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/common/loginpage/src/about-dialog.js b/common/loginpage/src/about-dialog.js index e6cdb632a..fed3155c0 100644 --- a/common/loginpage/src/about-dialog.js +++ b/common/loginpage/src/about-dialog.js @@ -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'); diff --git a/common/loginpage/src/panelabout.js b/common/loginpage/src/panelabout.js index d6abe4779..91876818a 100644 --- a/common/loginpage/src/panelabout.js +++ b/common/loginpage/src/panelabout.js @@ -152,6 +152,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); @@ -254,7 +255,7 @@ const $button = $('#idx-update-btnaction', this.view.$body); if ( info.button.text ) { $button.text(info.button.text); - $button.attr("data-action", info.button.action); + $button.data("action", info.button.action); } if ( info.button.lock ) { @@ -274,7 +275,6 @@ const onPanelShow = function(panel) { if (panel === this.action) { this.view.$dialog.show(); - this.view.$dialog.setBody(this.view.$body); } } @@ -294,11 +294,6 @@ CommonEvents.on('panel:show', onPanelShow.bind(this)); - $(document).off('click', '#idx-update-btnaction').on('click', '#idx-update-btnaction', function() { - const action = $(this).attr('data-action'); - if (action) sdk.execCommand('updates:action', action); - }); - return this; }, onfeaturesavailable: _on_features_avalable