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

[DE][PE][SSE] Update bootstrap (Fix get tip element)

Browse source
This commit is contained in:
JuliaSvinareva 2020-12-02 19:45:49 +03:00
parent 067874c8b4
commit 129abebdab
6 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1401,7 +1401,7 @@ define([
onError: function(id, level, errData) { onError: function(id, level, errData) {
if (id == Asc.c_oAscError.ID.LoadingScriptError) { if (id == Asc.c_oAscError.ID.LoadingScriptError) {
this.showTips([this.scriptLoadError]); this.showTips([this.scriptLoadError]);
this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000); this.tooltip && $(this.tooltip.getBSTip().getTipElement()).css('z-index', 10000);
return; return;
} }

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

@ -534,8 +534,8 @@ define([
} }
if ( recalc ) { if ( recalc ) {
screenTip.tipHeight = screenTip.toolTip.getBSTip().$tip.height(); screenTip.tipHeight = $(screenTip.toolTip.getBSTip().getTipElement()).height();
screenTip.tipWidth = screenTip.toolTip.getBSTip().$tip.width(); screenTip.tipWidth = $(screenTip.toolTip.getBSTip().getTipElement()).width();
} }
recalc = false; recalc = false;
@ -548,7 +548,7 @@ define([
} else } else
showPoint[1] -= screenTip.tipHeight; showPoint[1] -= screenTip.tipHeight;
screenTip.toolTip.getBSTip().$tip.css({top: showPoint[1] + 'px', left: showPoint[0] + 'px'}); $(screenTip.toolTip.getBSTip().getTipElement()).css({top: showPoint[1] + 'px', left: showPoint[0] + 'px'});
} }
/** coauthoring begin **/ /** coauthoring begin **/
else if (moveData.get_Type()==2 && me.mode.isEdit) { // 2 - locked object else if (moveData.get_Type()==2 && me.mode.isEdit) { // 2 - locked object

2
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1103,7 +1103,7 @@ define([
onError: function(id, level, errData) { onError: function(id, level, errData) {
if (id == Asc.c_oAscError.ID.LoadingScriptError) { if (id == Asc.c_oAscError.ID.LoadingScriptError) {
this.showTips([this.scriptLoadError]); this.showTips([this.scriptLoadError]);
this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000); this.tooltip && $(this.tooltip.getBSTip().getTipElement()).css('z-index', 10000);
return; return;
} }

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

@ -513,13 +513,13 @@ define([
} }
if ( recalc ) { if ( recalc ) {
screenTip.tipHeight = screenTip.toolTip.getBSTip().$tip.height(); screenTip.tipHeight = $(screenTip.toolTip.getBSTip().getTipElement()).height();
screenTip.tipWidth = screenTip.toolTip.getBSTip().$tip.width(); screenTip.tipWidth = $(screenTip.toolTip.getBSTip().getTipElement()).width();
} }
showPoint[1] -= screenTip.tipHeight; showPoint[1] -= screenTip.tipHeight;
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().getTipElement()).css({top: showPoint[1] + 'px', left: showPoint[0] + 'px'});
} }
} }
/** coauthoring begin **/ /** coauthoring begin **/

32
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1115,12 +1115,12 @@ define([
showPoint = [data.asc_getX(), data.asc_getY()]; showPoint = [data.asc_getX(), data.asc_getY()];
showPoint[0] += (pos[0] + 6); showPoint[0] += (pos[0] + 6);
showPoint[1] += (pos[1] - 20); showPoint[1] += (pos[1] - 20);
showPoint[1] -= hyperlinkTip.ref.getBSTip().$tip.height(); showPoint[1] -= $(hyperlinkTip.ref.getBSTip().getTipElement()).height();
var tipwidth = hyperlinkTip.ref.getBSTip().$tip.width(); var tipwidth = $(hyperlinkTip.ref.getBSTip().getTipElement()).width();
if (showPoint[0] + tipwidth > me.tooltips.coauth.bodyWidth ) if (showPoint[0] + tipwidth > me.tooltips.coauth.bodyWidth )
showPoint[0] = me.tooltips.coauth.bodyWidth - tipwidth; showPoint[0] = me.tooltips.coauth.bodyWidth - tipwidth;
hyperlinkTip.ref.getBSTip().$tip.css({ $(hyperlinkTip.ref.getBSTip().getTipElement()).css({
top : showPoint[1] + 'px', top : showPoint[1] + 'px',
left: showPoint[0] + 'px' left: showPoint[0] + 'px'
}); });
@ -1159,11 +1159,11 @@ define([
showPoint[0] += (pos[0] + 6); showPoint[0] += (pos[0] + 6);
showPoint[1] += (pos[1] - 20 - row_columnTip.ttHeight); showPoint[1] += (pos[1] - 20 - row_columnTip.ttHeight);
var tipwidth = row_columnTip.ref.getBSTip().$tip.width(); var tipwidth = $(row_columnTip.ref.getBSTip().getTipElement()).width();
if (showPoint[0] + tipwidth > me.tooltips.coauth.bodyWidth ) if (showPoint[0] + tipwidth > me.tooltips.coauth.bodyWidth )
showPoint[0] = me.tooltips.coauth.bodyWidth - tipwidth - 20; showPoint[0] = me.tooltips.coauth.bodyWidth - tipwidth - 20;
row_columnTip.ref.getBSTip().$tip.css({ $(row_columnTip.ref.getBSTip().getTipElement()).css({
top : showPoint[1] + 'px', top : showPoint[1] + 'px',
left: showPoint[0] + 'px' left: showPoint[0] + 'px'
}); });
@ -1284,17 +1284,17 @@ define([
showPoint = [data.asc_getX() + pos[0] - 10, data.asc_getY() + pos[1] + 20]; showPoint = [data.asc_getX() + pos[0] - 10, data.asc_getY() + pos[1] + 20];
var tipheight = filterTip.ref.getBSTip().$tip.width(); var tipheight = $(filterTip.ref.getBSTip().getTipElement()).width();
if (showPoint[1] + filterTip.ttHeight > me.tooltips.coauth.bodyHeight ) { if (showPoint[1] + filterTip.ttHeight > me.tooltips.coauth.bodyHeight ) {
showPoint[1] = me.tooltips.coauth.bodyHeight - filterTip.ttHeight - 5; showPoint[1] = me.tooltips.coauth.bodyHeight - filterTip.ttHeight - 5;
showPoint[0] += 20; showPoint[0] += 20;
} }
var tipwidth = filterTip.ref.getBSTip().$tip.width(); var tipwidth = $(filterTip.ref.getBSTip().getTipElement()).width();
if (showPoint[0] + tipwidth > me.tooltips.coauth.bodyWidth ) if (showPoint[0] + tipwidth > me.tooltips.coauth.bodyWidth )
showPoint[0] = me.tooltips.coauth.bodyWidth - tipwidth - 20; showPoint[0] = me.tooltips.coauth.bodyWidth - tipwidth - 20;
filterTip.ref.getBSTip().$tip.css({ $(filterTip.ref.getBSTip().getTipElement()).css({
top : showPoint[1] + 'px', top : showPoint[1] + 'px',
left: showPoint[0] + 'px' left: showPoint[0] + 'px'
}); });
@ -1332,11 +1332,11 @@ define([
showPoint[0] += (pos[0] + 6); showPoint[0] += (pos[0] + 6);
showPoint[1] += (pos[1] - 20 - slicerTip.ttHeight); showPoint[1] += (pos[1] - 20 - slicerTip.ttHeight);
var tipwidth = slicerTip.ref.getBSTip().$tip.width(); var tipwidth = $(slicerTip.ref.getBSTip().getTipElement()).width();
if (showPoint[0] + tipwidth > me.tooltips.coauth.bodyWidth ) if (showPoint[0] + tipwidth > me.tooltips.coauth.bodyWidth )
showPoint[0] = me.tooltips.coauth.bodyWidth - tipwidth - 20; showPoint[0] = me.tooltips.coauth.bodyWidth - tipwidth - 20;
slicerTip.ref.getBSTip().$tip.css({ $(slicerTip.ref.getBSTip().getTipElement()).css({
top : showPoint[1] + 'px', top : showPoint[1] + 'px',
left: showPoint[0] + 'px' left: showPoint[0] + 'px'
}); });
@ -2388,12 +2388,12 @@ define([
this.documentHolder.cmpEl.offset().top - $(window).scrollTop() this.documentHolder.cmpEl.offset().top - $(window).scrollTop()
], ],
coord = this.api.asc_getActiveCellCoord(), coord = this.api.asc_getActiveCellCoord(),
showPoint = [coord.asc_getX() + pos[0] - 3, coord.asc_getY() + pos[1] - functip.ref.getBSTip().$tip.height() - 5]; showPoint = [coord.asc_getX() + pos[0] - 3, coord.asc_getY() + pos[1] - $(functip.ref.getBSTip().getTipElement()).height() - 5];
var tipwidth = functip.ref.getBSTip().$tip.width(); var tipwidth = $(functip.ref.getBSTip().getTipElement()).width();
if (showPoint[0] + tipwidth > this.tooltips.coauth.bodyWidth ) if (showPoint[0] + tipwidth > this.tooltips.coauth.bodyWidth )
showPoint[0] = this.tooltips.coauth.bodyWidth - tipwidth; showPoint[0] = this.tooltips.coauth.bodyWidth - tipwidth;
functip.ref.getBSTip().$tip.css({ $(functip.ref.getBSTip().getTipElement()).css({
top : showPoint[1] + 'px', top : showPoint[1] + 'px',
left: showPoint[0] + 'px' left: showPoint[0] + 'px'
}); });
@ -2445,12 +2445,12 @@ define([
this.documentHolder.cmpEl.offset().top - $(window).scrollTop() this.documentHolder.cmpEl.offset().top - $(window).scrollTop()
], ],
coord = this.api.asc_getActiveCellCoord(), coord = this.api.asc_getActiveCellCoord(),
showPoint = [coord.asc_getX() + pos[0] - 3, coord.asc_getY() + pos[1] - inputtip.ref.getBSTip().$tip.height() - 5]; showPoint = [coord.asc_getX() + pos[0] - 3, coord.asc_getY() + pos[1] - $(inputtip.ref.getBSTip().getTipElement()).height() - 5];
var tipwidth = inputtip.ref.getBSTip().$tip.width(); var tipwidth = $(inputtip.ref.getBSTip().getTipElement()).width();
if (showPoint[0] + tipwidth > this.tooltips.coauth.bodyWidth ) if (showPoint[0] + tipwidth > this.tooltips.coauth.bodyWidth )
showPoint[0] = this.tooltips.coauth.bodyWidth - tipwidth; showPoint[0] = this.tooltips.coauth.bodyWidth - tipwidth;
inputtip.ref.getBSTip().$tip.css({ $(inputtip.ref.getBSTip().getTipElement()).css({
top : showPoint[1] + 'px', top : showPoint[1] + 'px',
left: showPoint[0] + 'px', left: showPoint[0] + 'px',
'z-index': 900 'z-index': 900

2
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1207,7 +1207,7 @@ define([
onError: function(id, level, errData) { onError: function(id, level, errData) {
if (id == Asc.c_oAscError.ID.LoadingScriptError) { if (id == Asc.c_oAscError.ID.LoadingScriptError) {
this.showTips([this.scriptLoadError]); this.showTips([this.scriptLoadError]);
this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000); this.tooltip && $(this.tooltip.getBSTip().getTipElement()).css('z-index', 10000);
return; return;
} }