Merge branch 'release/v7.0.0' of https://github.com/ONLYOFFICE/web-apps into release/v7.0.0
This commit is contained in:
commit
2e0693b760
|
@ -554,10 +554,11 @@ define([
|
|||
Asc.c_oAscFileType.OTT,
|
||||
Asc.c_oAscFileType.FB2,
|
||||
Asc.c_oAscFileType.EPUB,
|
||||
Asc.c_oAscFileType.DOCM,
|
||||
Asc.c_oAscFileType.DOCXF,
|
||||
Asc.c_oAscFileType.OFORM
|
||||
Asc.c_oAscFileType.DOCM
|
||||
];
|
||||
if (this.appOptions.canFeatureForms) {
|
||||
_supported = _supported.concat([Asc.c_oAscFileType.DOCXF, Asc.c_oAscFileType.OFORM]);
|
||||
}
|
||||
|
||||
if ( !_format || _supported.indexOf(_format) < 0 )
|
||||
_format = Asc.c_oAscFileType.DOCX;
|
||||
|
|
|
@ -159,10 +159,11 @@ define([
|
|||
Asc.c_oAscFileType.OTT,
|
||||
Asc.c_oAscFileType.FB2,
|
||||
Asc.c_oAscFileType.EPUB,
|
||||
Asc.c_oAscFileType.DOCM,
|
||||
Asc.c_oAscFileType.DOCXF,
|
||||
Asc.c_oAscFileType.OFORM
|
||||
Asc.c_oAscFileType.DOCM
|
||||
];
|
||||
if (_main.appOptions.canFeatureForms) {
|
||||
_supported = _supported.concat([Asc.c_oAscFileType.DOCXF, Asc.c_oAscFileType.OFORM]);
|
||||
}
|
||||
|
||||
if ( !_format || _supported.indexOf(_format) < 0 )
|
||||
_format = Asc.c_oAscFileType.PDF;
|
||||
|
|
|
@ -523,8 +523,8 @@ define([
|
|||
}
|
||||
|
||||
showPoint = [moveData.get_X(), moveData.get_Y()];
|
||||
showPoint[1] += (me._XY[1]-15);
|
||||
showPoint[0] += (me._XY[0]+5);
|
||||
showPoint[1] += ((me.isPreviewVisible ? 0 : me._XY[1])-15);
|
||||
showPoint[0] += ((me.isPreviewVisible ? 0 : me._XY[0])+5);
|
||||
|
||||
if (!screenTip.isVisible || recalc) {
|
||||
screenTip.isVisible = true;
|
||||
|
@ -536,6 +536,8 @@ define([
|
|||
screenTip.tipWidth = screenTip.toolTip.getBSTip().$tip.width();
|
||||
}
|
||||
showPoint[1] -= screenTip.tipHeight;
|
||||
if (showPoint[1]<0)
|
||||
showPoint[1] = 0;
|
||||
if (showPoint[0] + screenTip.tipWidth > me._BodyWidth )
|
||||
showPoint[0] = me._BodyWidth - screenTip.tipWidth;
|
||||
screenTip.toolTip.getBSTip().$tip.css({top: showPoint[1] + 'px', left: showPoint[0] + 'px'});
|
||||
|
|
Loading…
Reference in a new issue