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

Merge branch 'release/v7.0.0' of https://github.com/ONLYOFFICE/web-apps into release/v7.0.0

Browse source
This commit is contained in:
Maxim Kadushkin 2021-12-06 19:16:48 +03:00
parent 4205a29bc3 24c3c61ac4
commit 2e0693b760
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/documenteditor/main/app/controller/Main.js
View file

@ -554,10 +554,11 @@ define([
Asc.c_oAscFileType.OTT, Asc.c_oAscFileType.OTT,
Asc.c_oAscFileType.FB2, Asc.c_oAscFileType.FB2,
Asc.c_oAscFileType.EPUB, Asc.c_oAscFileType.EPUB,
Asc.c_oAscFileType.DOCM, Asc.c_oAscFileType.DOCM
Asc.c_oAscFileType.DOCXF,
Asc.c_oAscFileType.OFORM
]; ];
if (this.appOptions.canFeatureForms) {
_supported = _supported.concat([Asc.c_oAscFileType.DOCXF, Asc.c_oAscFileType.OFORM]);
}
if ( !_format || _supported.indexOf(_format) < 0 ) if ( !_format || _supported.indexOf(_format) < 0 )
_format = Asc.c_oAscFileType.DOCX; _format = Asc.c_oAscFileType.DOCX;

7
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -159,10 +159,11 @@ define([
Asc.c_oAscFileType.OTT, Asc.c_oAscFileType.OTT,
Asc.c_oAscFileType.FB2, Asc.c_oAscFileType.FB2,
Asc.c_oAscFileType.EPUB, Asc.c_oAscFileType.EPUB,
Asc.c_oAscFileType.DOCM, Asc.c_oAscFileType.DOCM
Asc.c_oAscFileType.DOCXF,
Asc.c_oAscFileType.OFORM
]; ];
if (_main.appOptions.canFeatureForms) {
_supported = _supported.concat([Asc.c_oAscFileType.DOCXF, Asc.c_oAscFileType.OFORM]);
}
if ( !_format || _supported.indexOf(_format) < 0 ) if ( !_format || _supported.indexOf(_format) < 0 )
_format = Asc.c_oAscFileType.PDF; _format = Asc.c_oAscFileType.PDF;

6
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -523,8 +523,8 @@ define([
} }
showPoint = [moveData.get_X(), moveData.get_Y()]; showPoint = [moveData.get_X(), moveData.get_Y()];
showPoint[1] += (me._XY[1]-15); showPoint[1] += ((me.isPreviewVisible ? 0 : me._XY[1])-15);
showPoint[0] += (me._XY[0]+5); showPoint[0] += ((me.isPreviewVisible ? 0 : me._XY[0])+5);
if (!screenTip.isVisible || recalc) { if (!screenTip.isVisible || recalc) {
screenTip.isVisible = true; screenTip.isVisible = true;
@ -536,6 +536,8 @@ define([
screenTip.tipWidth = screenTip.toolTip.getBSTip().$tip.width(); screenTip.tipWidth = screenTip.toolTip.getBSTip().$tip.width();
} }
showPoint[1] -= screenTip.tipHeight; showPoint[1] -= screenTip.tipHeight;
if (showPoint[1]<0)
showPoint[1] = 0;
if (showPoint[0] + screenTip.tipWidth > me._BodyWidth ) if (showPoint[0] + screenTip.tipWidth > me._BodyWidth )
showPoint[0] = me._BodyWidth - screenTip.tipWidth; showPoint[0] = me._BodyWidth - screenTip.tipWidth;
screenTip.toolTip.getBSTip().$tip.css({top: showPoint[1] + 'px', left: showPoint[0] + 'px'}); screenTip.toolTip.getBSTip().$tip.css({top: showPoint[1] + 'px', left: showPoint[0] + 'px'});