pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 08:21:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PDF] Fix Bug 68449

Browse Source
This commit is contained in:
Julia Radzhabova
2024-06-07 16:22:13 +03:00
parent a4a767a86a
commit 1256cc86f4
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
apps/pdfeditor/main/app/controller/DocumentHolder.js
View File

@ -2403,8 +2403,18 @@ define([
onShowTextBar: function(bounds) {
if (this.mode && !(!this.mode.isPDFEdit && this.mode.isEdit)) return;
if (_.isUndefined(this._XY)) {
this._XY = [
this.documentHolder.cmpEl.offset().left - $(window).scrollLeft(),
this.documentHolder.cmpEl.offset().top - $(window).scrollTop()
];
this._Width = this.documentHolder.cmpEl.width();
this._Height = this.documentHolder.cmpEl.height();
this._BodyWidth = $('body').width();
}
this.lastTextBarBounds = bounds;
if (bounds[3] < 0) {
if (bounds[3] < 0 || bounds[1] > this._Height) {
this.onHideTextBar();
return;
}
@ -2468,21 +2478,11 @@ define([
var showPoint = [(bounds[0] + bounds[2])/2 - textContainer.outerWidth()/2, bounds[1] - textContainer.outerHeight() - 10];
(showPoint[0]<0) && (showPoint[0] = 0);
if (showPoint[1]<0) {
showPoint[1] = bounds[3] + 10;
showPoint[1] = (bounds[3] > me._Height) ? 0 : bounds[3] + 10;
}
showPoint[1] = Math.min(me._Height - textContainer.outerHeight(), Math.max(0, showPoint[1]));
textContainer.css({left: showPoint[0], top : showPoint[1]});
if (_.isUndefined(me._XY)) {
me._XY = [
documentHolder.cmpEl.offset().left - $(window).scrollLeft(),
documentHolder.cmpEl.offset().top - $(window).scrollTop()
];
me._Width = documentHolder.cmpEl.width();
me._Height = documentHolder.cmpEl.height();
me._BodyWidth = $('body').width();
}
var diffDown = me._Height - showPoint[1] - textContainer.outerHeight(),
diffUp = me._XY[1] + showPoint[1],
menuAlign = (diffDown < 220 && diffDown < diffUp*0.9) ? 'bl-tl' : 'tl-bl';
@ -2796,8 +2796,18 @@ define([
onShowAnnotBar: function(bounds) {
if (this.mode && !this.mode.isEdit) return;
if (_.isUndefined(this._XY)) {
this._XY = [
this.documentHolder.cmpEl.offset().left - $(window).scrollLeft(),
this.documentHolder.cmpEl.offset().top - $(window).scrollTop()
];
this._Width = this.documentHolder.cmpEl.width();
this._Height = this.documentHolder.cmpEl.height();
this._BodyWidth = $('body').width();
}
this.lastAnnotBarBounds = bounds;
if (bounds[3] < 0) {
if (bounds[3] < 0 || bounds[1] > this._Height) {
this.onHideAnnotBar();
return;
}
@ -2834,21 +2844,11 @@ define([
var showPoint = [(bounds[0] + bounds[2])/2 - textContainer.outerWidth()/2, bounds[1] - textContainer.outerHeight() - 10];
(showPoint[0]<0) && (showPoint[0] = 0);
if (showPoint[1]<0) {
showPoint[1] = bounds[3] + 10;
showPoint[1] = (bounds[3] > me._Height) ? 0 : bounds[3] + 10;
}
showPoint[1] = Math.min(me._Height - textContainer.outerHeight(), Math.max(0, showPoint[1]));
textContainer.css({left: showPoint[0], top : showPoint[1]});
if (_.isUndefined(me._XY)) {
me._XY = [
documentHolder.cmpEl.offset().left - $(window).scrollLeft(),
documentHolder.cmpEl.offset().top - $(window).scrollTop()
];
me._Width = documentHolder.cmpEl.width();
me._Height = documentHolder.cmpEl.height();
me._BodyWidth = $('body').width();
}
var diffDown = me._Height - showPoint[1] - textContainer.outerHeight(),
diffUp = me._XY[1] + showPoint[1],
menuAlign = (diffDown < 220 && diffDown < diffUp*0.9) ? 'bl-tl' : 'tl-bl';