From 391b7479d5445edf2c97b82520bae2544a00ff4e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 26 May 2021 18:32:37 +0300 Subject: [PATCH 1/2] Fix dialog for signing --- apps/common/main/lib/view/SignDialog.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/view/SignDialog.js b/apps/common/main/lib/view/SignDialog.js index 261496c9c..b1f994fa5 100644 --- a/apps/common/main/lib/view/SignDialog.js +++ b/apps/common/main/lib/view/SignDialog.js @@ -105,15 +105,15 @@ define([ '', '', '' + - '', + '', '', - '', + '', '
', '' ].join(''); this.templateCertificate = _.template([ - '', + '', '' ].join('')); From b03132d69e9f98187fd2e77b56aaab449bfdded5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 26 May 2021 19:29:41 +0300 Subject: [PATCH 2/2] Fix Bug 50498 --- apps/common/main/lib/component/SynchronizeTip.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/common/main/lib/component/SynchronizeTip.js b/apps/common/main/lib/component/SynchronizeTip.js index b048d94e3..139c00ae0 100644 --- a/apps/common/main/lib/component/SynchronizeTip.js +++ b/apps/common/main/lib/component/SynchronizeTip.js @@ -128,6 +128,9 @@ define([ bottom = Common.Utils.innerHeight() - showxy.top - this.target.height()/2; } else if (pos == 'bottom') { top = showxy.top + this.target.height()/2; + var height = this.cmpEl.height(); + if (top+height>Common.Utils.innerHeight()) + top = Common.Utils.innerHeight() - height - 10; } else if (pos == 'left') { right = Common.Utils.innerWidth() - showxy.left - this.target.width()/2; } else if (pos == 'right') {