Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
fe0026bc
Commit
fe0026bc
authored
Nov 24, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Fix bug with layout for username-tip on the locked sheet.
parent
09ce1fb2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+2
-3
No files found.
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file @
fe0026bc
...
...
@@ -936,12 +936,10 @@ define([
$
(
document
.
body
).
append
(
src
);
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
]
];
!
is_sheet_lock
&&
(
showPoint
[
0
]
=
coAuthTip
.
bodyWidth
-
showPoint
[
0
]);
if
(
showPoint
[
1
]
>
coAuthTip
.
XY
[
1
]
&&
showPoint
[
1
]
+
coAuthTip
.
ttHeight
<
coAuthTip
.
XY
[
1
]
+
coAuthTip
.
apiHeight
)
{
src
.
text
(
getUserName
(
data
.
asc_getUserId
()));
...
...
@@ -1042,6 +1040,7 @@ define([
me
.
documentHolder
.
cmpEl
.
offset
().
top
-
$
(
window
).
scrollTop
()
];
me
.
tooltips
.
coauth
.
apiHeight
=
me
.
documentHolder
.
cmpEl
.
height
();
me
.
tooltips
.
coauth
.
rightMenuWidth
=
$
(
'
#right-menu
'
).
width
();
me
.
tooltips
.
coauth
.
bodyWidth
=
$
(
window
).
width
();
}
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment