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

Merge pull request #1320 from ONLYOFFICE/fix/bugfix

Browse source 
[SSE] Fix Bug 53730
This commit is contained in:
Julia Radzhabova 2021-11-16 15:06:11 +03:00 committed by GitHub
parent b9c54f5fa6 035acaf1f1
commit 06bf57e630
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/common/main/resources/less/synchronize-tip.less
View file

@ -95,6 +95,15 @@
border-radius: 2px; border-radius: 2px;
padding: 3px 12px; padding: 3px 12px;
margin-top: 10px; margin-top: 10px;
&:hover {
background-color: @highlight-header-button-hover-ie;
background-color: @highlight-header-button-hover;
}
&:active {
background-color: @highlight-header-button-pressed-ie;
background-color: @highlight-header-button-pressed;
}
} }
.show-link label { .show-link label {

1
apps/documenteditor/forms/app/view/ApplicationView.js
View file

@ -27,7 +27,6 @@ define([
menu : this.mnuThemes = new Common.UI.Menu({ menu : this.mnuThemes = new Common.UI.Menu({
cls: 'shifted-right', cls: 'shifted-right',
menuAlign: 'tl-tr', menuAlign: 'tl-tr',
restoreHeight: true,
items: [] items: []
}) })
}, },

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

@ -1066,6 +1066,7 @@ define([
if (this.tooltips.foreignSelect.ref) { if (this.tooltips.foreignSelect.ref) {
$(this.tooltips.foreignSelect.ref).remove(); $(this.tooltips.foreignSelect.ref).remove();
this.tooltips.foreignSelect.ref = undefined; this.tooltips.foreignSelect.ref = undefined;
this.tooltips.foreignSelect.userId = undefined;
this.tooltips.foreignSelect.x_point = undefined; this.tooltips.foreignSelect.x_point = undefined;
this.tooltips.foreignSelect.y_point = undefined; this.tooltips.foreignSelect.y_point = undefined;
} }
@ -1387,6 +1388,7 @@ define([
var src = $(document.createElement("div")), var src = $(document.createElement("div")),
color = data.asc_getColor(); color = data.asc_getColor();
foreignSelect.ref = src; foreignSelect.ref = src;
foreignSelect.userId = data.asc_getUserId();
src.addClass('username-tip'); src.addClass('username-tip');
src.css({ src.css({
@ -3754,6 +3756,9 @@ define([
/** coauthoring begin **/ /** coauthoring begin **/
var src; var src;
var me = this; var me = this;
if (me.tooltips && me.tooltips.foreignSelect && (me.tooltips.foreignSelect.userId == UserId)) {
me.hideForeignSelectTips();
}
for (var i=0; i<me.fastcoauthtips.length; i++) { for (var i=0; i<me.fastcoauthtips.length; i++) {
if (me.fastcoauthtips[i].attr('userid') == UserId) { if (me.fastcoauthtips[i].attr('userid') == UserId) {
src = me.fastcoauthtips[i]; src = me.fastcoauthtips[i];