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
79fb282c
Commit
79fb282c
authored
Feb 16, 2017
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug #33824. Improved performance of an undo in fast collaboration.
parent
2a6e4a08
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
common/CollaborativeEditingBase.js
common/CollaborativeEditingBase.js
+9
-9
word/Editor/Table.js
word/Editor/Table.js
+1
-1
No files found.
common/CollaborativeEditingBase.js
View file @
79fb282c
...
@@ -902,27 +902,27 @@ CCollaborativeEditingBase.prototype.private_RestoreDocumentState = function(DocS
...
@@ -902,27 +902,27 @@ CCollaborativeEditingBase.prototype.private_RestoreDocumentState = function(DocS
var
_oChange
=
oChange
.
Copy
();
var
_oChange
=
oChange
.
Copy
();
if
(
this
.
private_CommutateContentChanges
(
oContentChangesMap
,
oClass
,
_oChange
,
nPosition
+
nCount
))
if
(
this
.
private_CommutateContentChanges
(
oContentChangesMap
,
oClass
,
_oChange
,
nPosition
+
nCount
))
arrChanges
.
splice
(
0
,
0
,
_oChange
);
arrChanges
.
push
(
_oChange
);
}
}
else
else
{
{
var
_oChange
=
oChange
;
// TODO: Тут надо бы сделать копирование
var
_oChange
=
oChange
;
// TODO: Тут надо бы сделать копирование
if
(
this
.
private_CommutatePropertyChanges
(
oClass
,
_oChange
,
nPosition
+
nCount
))
if
(
this
.
private_CommutatePropertyChanges
(
oClass
,
_oChange
,
nPosition
+
nCount
))
arrChanges
.
splice
(
0
,
0
,
_oChange
);
arrChanges
.
push
(
_oChange
);
}
}
}
}
// Удаляем запись о последнем изменении
// Удаляем запись о последнем изменении
this
.
m_aOwnChangesIndexes
.
length
=
this
.
m_aOwnChangesIndexes
.
length
-
1
;
this
.
m_aOwnChangesIndexes
.
length
=
this
.
m_aOwnChangesIndexes
.
length
-
1
;
var
arrReverseChanges
=
[];
var
arrReverseChanges
=
[];
for
(
var
nIndex
=
0
,
nCount
=
arrChanges
.
length
;
nIndex
<
nCount
;
++
nIndex
)
for
(
var
nIndex
=
0
,
nCount
=
arrChanges
.
length
;
nIndex
<
nCount
;
++
nIndex
)
{
{
var
oReverseChange
=
arrChanges
[
nIndex
].
CreateReverseChange
();
var
oReverseChange
=
arrChanges
[
nIndex
].
CreateReverseChange
();
if
(
oReverseChange
)
if
(
oReverseChange
)
arrReverseChanges
.
splice
(
0
,
0
,
oReverseChange
);
arrReverseChanges
.
push
(
oReverseChange
);
}
}
// Накатываем изменения в данном клиенте
// Накатываем изменения в данном клиенте
var
oLogicDocument
=
this
.
m_oLogicDocument
;
var
oLogicDocument
=
this
.
m_oLogicDocument
;
...
...
word/Editor/Table.js
View file @
79fb282c
...
@@ -11782,7 +11782,7 @@ CTable.prototype.Set_ContentPosition = function(DocPos, Depth, Flag)
...
@@ -11782,7 +11782,7 @@ CTable.prototype.Set_ContentPosition = function(DocPos, Depth, Flag)
_DocPos
=
null
;
_DocPos
=
null
;
_Flag
=
1
;
_Flag
=
1
;
}
}
else
if
(
CurRow
Row
>
0
)
else
if
(
CurRow
>
0
)
{
{
CurRow
--
;
CurRow
--
;
_DocPos
=
null
;
_DocPos
=
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