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
982f177e
Commit
982f177e
authored
Dec 05, 2016
by
Ilya Kirillov
Committed by
GitHub
Dec 05, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #87 from ONLYOFFICE/hotfix/v4.2.1
Hotfix/v4.2.1
parents
740894a4
ed86c2f5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
common/Charts/DrawingObjects.js
common/Charts/DrawingObjects.js
+1
-1
word/Editor/History.js
word/Editor/History.js
+5
-3
No files found.
common/Charts/DrawingObjects.js
View file @
982f177e
...
@@ -2866,7 +2866,7 @@ function DrawingObjects() {
...
@@ -2866,7 +2866,7 @@ function DrawingObjects() {
_this
.
controller
.
selectObject
(
aObjects
[
0
].
graphicObject
,
0
);
_this
.
controller
.
selectObject
(
aObjects
[
0
].
graphicObject
,
0
);
}
}
_this
.
controller
.
editChartDrawingObjects
(
chart
);
_this
.
controller
.
editChartDrawingObjects
(
chart
);
_this
.
showDrawingObjects
(
false
);
//
_this.showDrawingObjects(false);
}
}
};
};
...
...
word/Editor/History.js
View file @
982f177e
...
@@ -1124,9 +1124,9 @@ CHistory.prototype.private_UpdateContentChangesOnRedo = function(Item)
...
@@ -1124,9 +1124,9 @@ CHistory.prototype.private_UpdateContentChangesOnRedo = function(Item)
var
bAdd
=
this
.
private_IsAddContentChange
(
Item
.
Class
,
Item
.
Data
);
var
bAdd
=
this
.
private_IsAddContentChange
(
Item
.
Class
,
Item
.
Data
);
var
Count
=
this
.
private_GetItemsCountInContentChange
(
Item
.
Class
,
Item
.
Data
);
var
Count
=
this
.
private_GetItemsCountInContentChange
(
Item
.
Class
,
Item
.
Data
);
var
ContentChanges
=
new
AscCommon
.
CContentChangesElement
(
(
bAdd
==
true
?
AscCommon
.
contentchanges_Add
:
AscCommon
.
contentchanges_Remove
),
Data
.
Pos
,
Count
,
Item
);
var
ContentChanges
=
new
AscCommon
.
CContentChangesElement
(
(
bAdd
==
true
?
AscCommon
.
contentchanges_Add
:
AscCommon
.
contentchanges_Remove
),
Item
.
Data
.
Pos
,
Count
,
Item
);
Class
.
Add_ContentChanges
(
ContentChanges
);
Item
.
Class
.
Add_ContentChanges
(
ContentChanges
);
this
.
CollaborativeEditing
.
Add_NewDC
(
Class
);
this
.
CollaborativeEditing
.
Add_NewDC
(
Item
.
Class
);
}
}
};
};
CHistory
.
prototype
.
private_IsContentChange
=
function
(
Class
,
Data
)
CHistory
.
prototype
.
private_IsContentChange
=
function
(
Class
,
Data
)
...
@@ -1149,6 +1149,8 @@ CHistory.prototype.private_IsContentChange = function(Class, Data)
...
@@ -1149,6 +1149,8 @@ CHistory.prototype.private_IsContentChange = function(Class, Data)
};
};
CHistory
.
prototype
.
private_IsAddContentChange
=
function
(
Class
,
Data
)
CHistory
.
prototype
.
private_IsAddContentChange
=
function
(
Class
,
Data
)
{
{
var
bPresentation
=
!
(
typeof
CPresentation
===
"
undefined
"
);
var
bSlide
=
!
(
typeof
Slide
===
"
undefined
"
);
return
(
(
Class
instanceof
CDocument
&&
AscDFH
.
historyitem_Document_AddItem
===
Data
.
Type
)
||
return
(
(
Class
instanceof
CDocument
&&
AscDFH
.
historyitem_Document_AddItem
===
Data
.
Type
)
||
(
((
Class
instanceof
CDocumentContent
||
Class
instanceof
AscFormat
.
CDrawingDocContent
))
&&
AscDFH
.
historyitem_DocumentContent_AddItem
===
Data
.
Type
)
||
(
((
Class
instanceof
CDocumentContent
||
Class
instanceof
AscFormat
.
CDrawingDocContent
))
&&
AscDFH
.
historyitem_DocumentContent_AddItem
===
Data
.
Type
)
||
(
Class
instanceof
CTable
&&
AscDFH
.
historyitem_Table_AddRow
===
Data
.
Type
)
||
(
Class
instanceof
CTable
&&
AscDFH
.
historyitem_Table_AddRow
===
Data
.
Type
)
||
...
...
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