Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #904 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-05-26 19:48:07 +03:00 committed by GitHub
parent 84c23a30f5 b03132d69e
commit 3f63ecab7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/common/main/lib/component/SynchronizeTip.js
View file

@ -128,6 +128,9 @@ define([
bottom = Common.Utils.innerHeight() - showxy.top - this.target.height()/2; bottom = Common.Utils.innerHeight() - showxy.top - this.target.height()/2;
} else if (pos == 'bottom') { } else if (pos == 'bottom') {
top = showxy.top + this.target.height()/2; 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') { } else if (pos == 'left') {
right = Common.Utils.innerWidth() - showxy.left - this.target.width()/2; right = Common.Utils.innerWidth() - showxy.left - this.target.width()/2;
} else if (pos == 'right') { } else if (pos == 'right') {

6
apps/common/main/lib/view/SignDialog.js
View file

@ -105,15 +105,15 @@ define([
'<table style="margin-top: 30px;">', '<table style="margin-top: 30px;">',
'<tr>', '<tr>',
'<td><label style="font-weight: bold;margin-bottom: 3px;">' + this.textCertificate + '</label></td>' + '<td><label style="font-weight: bold;margin-bottom: 3px;">' + this.textCertificate + '</label></td>' +
'<td rowspan="2" style="vertical-align: top; padding-left: 30px;"><button id="id-dlg-sign-change" class="btn btn-text-default" style="">' + this.textSelect + '</button></td>', '<td rowspan="2" style="vertical-align: top; padding-left: 20px;"><button id="id-dlg-sign-change" class="btn btn-text-default" style="float:right;">' + this.textSelect + '</button></td>',
'</tr>', '</tr>',
'<tr><td><div id="id-dlg-sign-certificate" class="hidden" style="max-width: 212px;overflow: hidden;"></td></tr>', '<tr><td><div id="id-dlg-sign-certificate" class="hidden" style="max-width: 240px;overflow: hidden;white-space: nowrap;"></td></tr>',
'</table>', '</table>',
'</div>' '</div>'
].join(''); ].join('');
this.templateCertificate = _.template([ this.templateCertificate = _.template([
'<label style="display: block;margin-bottom: 3px;"><%= Common.Utils.String.htmlEncode(name) %></label>', '<label style="display: block;margin-bottom: 3px;overflow: hidden;text-overflow: ellipsis;"><%= Common.Utils.String.htmlEncode(name) %></label>',
'<label style="display: block;"><%= Common.Utils.String.htmlEncode(valid) %></label>' '<label style="display: block;"><%= Common.Utils.String.htmlEncode(valid) %></label>'
].join('')); ].join(''));