Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
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
sdkjs
Commits
9d1b50cc
Commit
9d1b50cc
authored
Feb 15, 2017
by
Alexey.Musinov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix crash
parent
d1a54e09
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
0 deletions
+13
-0
cell/native/native.js
cell/native/native.js
+13
-0
No files found.
cell/native/native.js
View file @
9d1b50cc
...
@@ -7505,6 +7505,10 @@ function testLockedObjects () {
...
@@ -7505,6 +7505,10 @@ function testLockedObjects () {
window
[
"
AscCommonExcel
"
].
WorksheetView
.
prototype
.
_drawCollaborativeElementsMeOther
=
function
(
type
,
overlay
)
{
window
[
"
AscCommonExcel
"
].
WorksheetView
.
prototype
.
_drawCollaborativeElementsMeOther
=
function
(
type
,
overlay
)
{
var
currentSheetId
=
this
.
model
.
getId
(),
i
,
strokeColor
,
arrayCells
,
oCellTmp
;
var
currentSheetId
=
this
.
model
.
getId
(),
i
,
strokeColor
,
arrayCells
,
oCellTmp
;
if
(
!
currentSheetId
)
return
;
if
(
AscCommon
.
c_oAscLockTypes
.
kLockTypeMine
===
type
)
{
if
(
AscCommon
.
c_oAscLockTypes
.
kLockTypeMine
===
type
)
{
strokeColor
=
AscCommonExcel
.
c_oAscCoAuthoringMeBorderColor
;
strokeColor
=
AscCommonExcel
.
c_oAscCoAuthoringMeBorderColor
;
arrayCells
=
this
.
collaborativeEditing
.
getLockCellsMe
(
currentSheetId
);
arrayCells
=
this
.
collaborativeEditing
.
getLockCellsMe
(
currentSheetId
);
...
@@ -7517,6 +7521,8 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsMeOth
...
@@ -7517,6 +7521,8 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsMeOth
}
}
var
sheetId
=
this
.
model
.
getId
();
var
sheetId
=
this
.
model
.
getId
();
if
(
!
sheetId
)
return
;
for
(
i
=
0
;
i
<
arrayCells
.
length
;
++
i
)
{
for
(
i
=
0
;
i
<
arrayCells
.
length
;
++
i
)
{
...
@@ -7552,6 +7558,9 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsMeOth
...
@@ -7552,6 +7558,9 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsMeOth
window
[
"
AscCommonExcel
"
].
WorksheetView
.
prototype
.
_drawCollaborativeElementsAllLock
=
function
(
overlay
)
{
window
[
"
AscCommonExcel
"
].
WorksheetView
.
prototype
.
_drawCollaborativeElementsAllLock
=
function
(
overlay
)
{
var
currentSheetId
=
this
.
model
.
getId
();
var
currentSheetId
=
this
.
model
.
getId
();
if
(
!
currentSheetId
)
return
;
var
nLockAllType
=
this
.
collaborativeEditing
.
isLockAllOther
(
currentSheetId
);
var
nLockAllType
=
this
.
collaborativeEditing
.
isLockAllOther
(
currentSheetId
);
if
(
Asc
.
c_oAscMouseMoveLockedObjectType
.
None
!==
nLockAllType
)
{
if
(
Asc
.
c_oAscMouseMoveLockedObjectType
.
None
!==
nLockAllType
)
{
var
isAllRange
=
true
,
strokeColor
=
(
Asc
.
c_oAscMouseMoveLockedObjectType
.
TableProperties
===
nLockAllType
)
?
var
isAllRange
=
true
,
strokeColor
=
(
Asc
.
c_oAscMouseMoveLockedObjectType
.
TableProperties
===
nLockAllType
)
?
...
@@ -7560,6 +7569,10 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsAllLo
...
@@ -7560,6 +7569,10 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsAllLo
var
left
=
this
.
cols
[
oAllRange
.
c1
].
left
,
top
=
this
.
rows
[
oAllRange
.
r1
].
top
;
var
left
=
this
.
cols
[
oAllRange
.
c1
].
left
,
top
=
this
.
rows
[
oAllRange
.
r1
].
top
;
var
sheetId
=
this
.
model
.
getId
();
if
(
!
sheetId
)
return
;
var
userId
=
""
;
var
userId
=
""
;
var
lockInfo
=
this
.
collaborativeEditing
.
getLockInfo
(
AscCommonExcel
.
c_oAscLockTypeElem
.
Range
,
var
lockInfo
=
this
.
collaborativeEditing
.
getLockInfo
(
AscCommonExcel
.
c_oAscLockTypeElem
.
Range
,
null
,
null
,
...
...
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