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
77f2d91b
Commit
77f2d91b
authored
Feb 09, 2017
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug #33962. Fixed issue with undo in fast collaborative.
parent
2c1964a9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
13 deletions
+17
-13
word/Editor/CollaborativeEditing.js
word/Editor/CollaborativeEditing.js
+17
-12
word/Editor/Paragraph.js
word/Editor/Paragraph.js
+0
-1
No files found.
word/Editor/CollaborativeEditing.js
View file @
77f2d91b
...
@@ -762,19 +762,23 @@ CWordCollaborativeEditing.prototype.Undo = function()
...
@@ -762,19 +762,23 @@ CWordCollaborativeEditing.prototype.Undo = function()
var
oHistory
=
AscCommon
.
History
;
var
oHistory
=
AscCommon
.
History
;
oHistory
.
CreateNewPointForCollectChanges
();
oHistory
.
CreateNewPointForCollectChanges
();
var
oDrawing
;
var
oDrawing
;
for
(
var
sId
in
mapDrawings
){
for
(
var
sId
in
mapDrawings
)
if
(
mapDrawings
.
hasOwnProperty
(
sId
)){
{
oDrawing
=
mapDrawings
[
sId
];
if
(
mapDrawings
.
hasOwnProperty
(
sId
))
if
(
!
oDrawing
.
CheckCorrect
()){
{
var
oParentParagraph
=
oDrawing
.
Get_ParentParagraph
();
oDrawing
=
mapDrawings
[
sId
];
oDrawing
.
Remove_FromDocument
(
false
);
if
(
!
oDrawing
.
CheckCorrect
())
if
(
oParentParagraph
){
{
mapParagraphs
[
oParentParagraph
.
Get_Id
()]
=
oParentParagraph
;
var
oParentParagraph
=
oDrawing
.
Get_ParentParagraph
();
}
oDrawing
.
Remove_FromDocument
(
false
);
}
if
(
oParentParagraph
)
}
{
mapParagraphs
[
oParentParagraph
.
Get_Id
()]
=
oParentParagraph
;
}
}
}
}
}
for
(
var
sId
in
mapDocumentContents
)
for
(
var
sId
in
mapDocumentContents
)
{
{
var
oDocumentContent
=
mapDocumentContents
[
sId
];
var
oDocumentContent
=
mapDocumentContents
[
sId
];
...
@@ -798,6 +802,7 @@ CWordCollaborativeEditing.prototype.Undo = function()
...
@@ -798,6 +802,7 @@ CWordCollaborativeEditing.prototype.Undo = function()
arrReverseChanges
.
push
(
oHistoryPoint
.
Items
[
nIndex
].
Data
);
arrReverseChanges
.
push
(
oHistoryPoint
.
Items
[
nIndex
].
Data
);
}
}
oHistory
.
Remove_LastPoint
();
oHistory
.
Remove_LastPoint
();
this
.
Clear_DCChanges
();
var
oBinaryWriter
=
AscCommon
.
History
.
BinaryWriter
;
var
oBinaryWriter
=
AscCommon
.
History
.
BinaryWriter
;
var
aSendingChanges
=
[];
var
aSendingChanges
=
[];
...
...
word/Editor/Paragraph.js
View file @
77f2d91b
...
@@ -5334,7 +5334,6 @@ Paragraph.prototype =
...
@@ -5334,7 +5334,6 @@ Paragraph.prototype =
if
((
para_Hyperlink
===
CurElement
.
Type
||
para_Math
===
CurElement
.
Type
||
para_Field
===
CurElement
.
Type
)
&&
true
===
CurElement
.
Is_Empty
()
&&
true
!==
CurElement
.
Is_CheckingNearestPos
())
if
((
para_Hyperlink
===
CurElement
.
Type
||
para_Math
===
CurElement
.
Type
||
para_Field
===
CurElement
.
Type
)
&&
true
===
CurElement
.
Is_Empty
()
&&
true
!==
CurElement
.
Is_CheckingNearestPos
())
{
{
this
.
Internal_Content_Remove
(
CurPos
);
this
.
Internal_Content_Remove
(
CurPos
);
CurPos
++
;
}
}
else
if
(
para_Comment
===
CurElement
.
Type
&&
false
===
CurElement
.
Start
)
else
if
(
para_Comment
===
CurElement
.
Type
&&
false
===
CurElement
.
Start
)
{
{
...
...
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