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

[SSE] Fix bug with layout for username-tip on the locked sheet.

Browse source
This commit is contained in:
Julia Radzhabova 2016-11-24 15:30:38 +03:00
parent 09ce1fb212
commit fe0026bc30
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -936,12 +936,10 @@ define([
$(document.body).append(src); $(document.body).append(src);
showPoint = [ showPoint = [
coAuthTip.x_point + coAuthTip.XY[0], (is_sheet_lock) ? (coAuthTip.x_point + coAuthTip.rightMenuWidth) : (coAuthTip.bodyWidth - (coAuthTip.x_point + coAuthTip.XY[0])),
coAuthTip.y_point + coAuthTip.XY[1] coAuthTip.y_point + coAuthTip.XY[1]
]; ];
!is_sheet_lock && (showPoint[0] = coAuthTip.bodyWidth - showPoint[0]);
if (showPoint[1] > coAuthTip.XY[1] && if (showPoint[1] > coAuthTip.XY[1] &&
showPoint[1] + coAuthTip.ttHeight < coAuthTip.XY[1] + coAuthTip.apiHeight) { showPoint[1] + coAuthTip.ttHeight < coAuthTip.XY[1] + coAuthTip.apiHeight) {
src.text(getUserName(data.asc_getUserId())); src.text(getUserName(data.asc_getUserId()));
@ -1042,6 +1040,7 @@ define([
me.documentHolder.cmpEl.offset().top - $(window).scrollTop() me.documentHolder.cmpEl.offset().top - $(window).scrollTop()
]; ];
me.tooltips.coauth.apiHeight = me.documentHolder.cmpEl.height(); me.tooltips.coauth.apiHeight = me.documentHolder.cmpEl.height();
me.tooltips.coauth.rightMenuWidth = $('#right-menu').width();
me.tooltips.coauth.bodyWidth = $(window).width(); me.tooltips.coauth.bodyWidth = $(window).width();
} }
}, },