diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 6d3284d4d..dd4c25e4c 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1401,7 +1401,7 @@ define([ onError: function(id, level, errData) { if (id == Asc.c_oAscError.ID.LoadingScriptError) { 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; } diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 25bc2c0b6..960f81b0b 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -534,8 +534,8 @@ define([ } if ( recalc ) { - screenTip.tipHeight = screenTip.toolTip.getBSTip().$tip.height(); - screenTip.tipWidth = screenTip.toolTip.getBSTip().$tip.width(); + screenTip.tipHeight = $(screenTip.toolTip.getBSTip().getTipElement()).height(); + screenTip.tipWidth = $(screenTip.toolTip.getBSTip().getTipElement()).width(); } recalc = false; @@ -548,7 +548,7 @@ define([ } else 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 **/ else if (moveData.get_Type()==2 && me.mode.isEdit) { // 2 - locked object diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index d5ebf008a..afb76167f 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1103,7 +1103,7 @@ define([ onError: function(id, level, errData) { if (id == Asc.c_oAscError.ID.LoadingScriptError) { 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; } diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 1ed542ac0..3a96664a1 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -513,13 +513,13 @@ define([ } if ( recalc ) { - screenTip.tipHeight = screenTip.toolTip.getBSTip().$tip.height(); - screenTip.tipWidth = screenTip.toolTip.getBSTip().$tip.width(); + screenTip.tipHeight = $(screenTip.toolTip.getBSTip().getTipElement()).height(); + screenTip.tipWidth = $(screenTip.toolTip.getBSTip().getTipElement()).width(); } showPoint[1] -= screenTip.tipHeight; 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'}); + $(screenTip.toolTip.getBSTip().getTipElement()).css({top: showPoint[1] + 'px', left: showPoint[0] + 'px'}); } } /** coauthoring begin **/ diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 8c0b5887f..995d394ff 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1115,12 +1115,12 @@ define([ showPoint = [data.asc_getX(), data.asc_getY()]; showPoint[0] += (pos[0] + 6); showPoint[1] += (pos[1] - 20); - showPoint[1] -= hyperlinkTip.ref.getBSTip().$tip.height(); - var tipwidth = hyperlinkTip.ref.getBSTip().$tip.width(); + showPoint[1] -= $(hyperlinkTip.ref.getBSTip().getTipElement()).height(); + var tipwidth = $(hyperlinkTip.ref.getBSTip().getTipElement()).width(); if (showPoint[0] + tipwidth > me.tooltips.coauth.bodyWidth ) showPoint[0] = me.tooltips.coauth.bodyWidth - tipwidth; - hyperlinkTip.ref.getBSTip().$tip.css({ + $(hyperlinkTip.ref.getBSTip().getTipElement()).css({ top : showPoint[1] + 'px', left: showPoint[0] + 'px' }); @@ -1159,11 +1159,11 @@ define([ showPoint[0] += (pos[0] + 6); 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 ) showPoint[0] = me.tooltips.coauth.bodyWidth - tipwidth - 20; - row_columnTip.ref.getBSTip().$tip.css({ + $(row_columnTip.ref.getBSTip().getTipElement()).css({ top : showPoint[1] + 'px', left: showPoint[0] + 'px' }); @@ -1284,17 +1284,17 @@ define([ 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 ) { showPoint[1] = me.tooltips.coauth.bodyHeight - filterTip.ttHeight - 5; 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 ) showPoint[0] = me.tooltips.coauth.bodyWidth - tipwidth - 20; - filterTip.ref.getBSTip().$tip.css({ + $(filterTip.ref.getBSTip().getTipElement()).css({ top : showPoint[1] + 'px', left: showPoint[0] + 'px' }); @@ -1332,11 +1332,11 @@ define([ showPoint[0] += (pos[0] + 6); 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 ) showPoint[0] = me.tooltips.coauth.bodyWidth - tipwidth - 20; - slicerTip.ref.getBSTip().$tip.css({ + $(slicerTip.ref.getBSTip().getTipElement()).css({ top : showPoint[1] + 'px', left: showPoint[0] + 'px' }); @@ -2388,12 +2388,12 @@ define([ this.documentHolder.cmpEl.offset().top - $(window).scrollTop() ], coord = this.api.asc_getActiveCellCoord(), - showPoint = [coord.asc_getX() + pos[0] - 3, coord.asc_getY() + pos[1] - functip.ref.getBSTip().$tip.height() - 5]; - var tipwidth = functip.ref.getBSTip().$tip.width(); + showPoint = [coord.asc_getX() + pos[0] - 3, coord.asc_getY() + pos[1] - $(functip.ref.getBSTip().getTipElement()).height() - 5]; + var tipwidth = $(functip.ref.getBSTip().getTipElement()).width(); if (showPoint[0] + tipwidth > this.tooltips.coauth.bodyWidth ) showPoint[0] = this.tooltips.coauth.bodyWidth - tipwidth; - functip.ref.getBSTip().$tip.css({ + $(functip.ref.getBSTip().getTipElement()).css({ top : showPoint[1] + 'px', left: showPoint[0] + 'px' }); @@ -2445,12 +2445,12 @@ define([ this.documentHolder.cmpEl.offset().top - $(window).scrollTop() ], coord = this.api.asc_getActiveCellCoord(), - showPoint = [coord.asc_getX() + pos[0] - 3, coord.asc_getY() + pos[1] - inputtip.ref.getBSTip().$tip.height() - 5]; - var tipwidth = inputtip.ref.getBSTip().$tip.width(); + showPoint = [coord.asc_getX() + pos[0] - 3, coord.asc_getY() + pos[1] - $(inputtip.ref.getBSTip().getTipElement()).height() - 5]; + var tipwidth = $(inputtip.ref.getBSTip().getTipElement()).width(); if (showPoint[0] + tipwidth > this.tooltips.coauth.bodyWidth ) showPoint[0] = this.tooltips.coauth.bodyWidth - tipwidth; - inputtip.ref.getBSTip().$tip.css({ + $(inputtip.ref.getBSTip().getTipElement()).css({ top : showPoint[1] + 'px', left: showPoint[0] + 'px', 'z-index': 900 diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 5017242a1..e49fe42b6 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1207,7 +1207,7 @@ define([ onError: function(id, level, errData) { if (id == Asc.c_oAscError.ID.LoadingScriptError) { 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; }