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
7fd01199
Commit
7fd01199
authored
Feb 08, 2017
by
Sergey Luzyanin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed typos
parent
de0bb9ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
common/Drawings/DrawingsChanges.js
common/Drawings/DrawingsChanges.js
+2
-1
slide/Editor/Format/Layout.js
slide/Editor/Format/Layout.js
+11
-10
No files found.
common/Drawings/DrawingsChanges.js
View file @
7fd01199
...
@@ -149,7 +149,8 @@
...
@@ -149,7 +149,8 @@
window
[
'
AscDFH
'
].
CChangesDrawingsObjectNoId
=
CChangesDrawingsObjectNoId
;
window
[
'
AscDFH
'
].
CChangesDrawingsObjectNoId
=
CChangesDrawingsObjectNoId
;
CChangesDrawingsObjectNoId
.
prototype
.
ReadFromBinary
=
function
(
reader
)
{
CChangesDrawingsObjectNoId
.
prototype
.
ReadFromBinary
=
function
(
reader
)
{
reader
.
Seek2
(
reader
.
GetCurPos
()
-
4
);
reader
.
Seek2
(
reader
.
GetCurPos
()
-
4
);
this
.
Type
=
reader
.
GetLong
();
var
nType
=
reader
.
GetLong
();
this
.
Type
=
nType
;
this
.
FromLoad
=
true
;
this
.
FromLoad
=
true
;
CChangesDrawingsObjectNoId
.
superclass
.
ReadFromBinary
.
call
(
this
,
reader
);
CChangesDrawingsObjectNoId
.
superclass
.
ReadFromBinary
.
call
(
this
,
reader
);
};
};
...
...
slide/Editor/Format/Layout.js
View file @
7fd01199
...
@@ -38,12 +38,12 @@ var History = AscCommon.History;
...
@@ -38,12 +38,12 @@ var History = AscCommon.History;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetMaster
]
=
AscDFH
.
CChangesDrawingsObject
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetMaster
]
=
AscDFH
.
CChangesDrawingsObject
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetMatchingName
]
=
AscDFH
.
CChangesDrawingsObject
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetMatchingName
]
=
AscDFH
.
CChangesDrawingsObject
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetType
]
=
AscDFH
.
CChangesDrawings
Object
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetType
]
=
AscDFH
.
CChangesDrawings
Long
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetBg
]
=
AscDFH
.
CChangesDrawingsObjectNoId
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetBg
]
=
AscDFH
.
CChangesDrawingsObjectNoId
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetCSldName
]
=
AscDFH
.
CChangesDrawings
Object
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetCSldName
]
=
AscDFH
.
CChangesDrawings
String
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetShow
]
=
AscDFH
.
CChangesDrawings
Object
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetShow
]
=
AscDFH
.
CChangesDrawings
Bool
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetShowPhAnim
]
=
AscDFH
.
CChangesDrawings
Object
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetShowPhAnim
]
=
AscDFH
.
CChangesDrawings
Bool
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetShowMasterSp
]
=
AscDFH
.
CChangesDrawings
Object
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetShowMasterSp
]
=
AscDFH
.
CChangesDrawings
Bool
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetClrMapOverride
]
=
AscDFH
.
CChangesDrawingsObject
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetClrMapOverride
]
=
AscDFH
.
CChangesDrawingsObject
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutAddToSpTree
]
=
AscDFH
.
CChangesDrawingsContent
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutAddToSpTree
]
=
AscDFH
.
CChangesDrawingsContent
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetSize
]
=
AscDFH
.
CChangesDrawingsObjectNoId
;
AscDFH
.
changesFactory
[
AscDFH
.
historyitem_SlideLayoutSetSize
]
=
AscDFH
.
CChangesDrawingsObjectNoId
;
...
@@ -76,6 +76,7 @@ AscDFH.drawingsChangesMap[AscDFH.historyitem_SlideLayoutSetShow] =
...
@@ -76,6 +76,7 @@ AscDFH.drawingsChangesMap[AscDFH.historyitem_SlideLayoutSetShow] =
AscDFH
.
drawingsChangesMap
[
AscDFH
.
historyitem_SlideLayoutSetShowPhAnim
]
=
function
(
oClass
,
value
){
oClass
.
showMasterPhAnim
=
value
;};
AscDFH
.
drawingsChangesMap
[
AscDFH
.
historyitem_SlideLayoutSetShowPhAnim
]
=
function
(
oClass
,
value
){
oClass
.
showMasterPhAnim
=
value
;};
AscDFH
.
drawingsChangesMap
[
AscDFH
.
historyitem_SlideLayoutSetShowMasterSp
]
=
function
(
oClass
,
value
){
oClass
.
showMasterSp
=
value
;};
AscDFH
.
drawingsChangesMap
[
AscDFH
.
historyitem_SlideLayoutSetShowMasterSp
]
=
function
(
oClass
,
value
){
oClass
.
showMasterSp
=
value
;};
AscDFH
.
drawingsChangesMap
[
AscDFH
.
historyitem_SlideLayoutSetClrMapOverride
]
=
function
(
oClass
,
value
){
oClass
.
clrMap
=
value
;};
AscDFH
.
drawingsChangesMap
[
AscDFH
.
historyitem_SlideLayoutSetClrMapOverride
]
=
function
(
oClass
,
value
){
oClass
.
clrMap
=
value
;};
AscDFH
.
drawingsChangesMap
[
AscDFH
.
historyitem_SlideLayoutSetSize
]
=
function
(
oClass
,
value
){
oClass
.
Width
=
value
.
a
;
oClass
.
Height
=
value
.
b
;};
AscDFH
.
drawingContentChanges
[
AscDFH
.
historyitem_SlideLayoutAddToSpTree
]
=
function
(
oClass
){
AscDFH
.
drawingContentChanges
[
AscDFH
.
historyitem_SlideLayoutAddToSpTree
]
=
function
(
oClass
){
return
oClass
.
cSld
.
spTree
;
return
oClass
.
cSld
.
spTree
;
...
@@ -151,7 +152,7 @@ SlideLayout.prototype =
...
@@ -151,7 +152,7 @@ SlideLayout.prototype =
setType
:
function
(
type
)
setType
:
function
(
type
)
{
{
History
.
Add
(
new
AscDFH
.
CChangesDrawings
Object
(
this
,
AscDFH
.
historyitem_SlideLayoutSetType
,
this
.
type
,
type
));
History
.
Add
(
new
AscDFH
.
CChangesDrawings
Long
(
this
,
AscDFH
.
historyitem_SlideLayoutSetType
,
this
.
type
,
type
));
this
.
type
=
type
;
this
.
type
=
type
;
},
},
...
@@ -163,24 +164,24 @@ SlideLayout.prototype =
...
@@ -163,24 +164,24 @@ SlideLayout.prototype =
setCSldName
:
function
(
name
)
setCSldName
:
function
(
name
)
{
{
History
.
Add
(
new
AscDFH
.
CChangesDrawings
Object
(
this
,
AscDFH
.
historyitem_SlideLayoutSetCSldName
,
this
.
cSld
.
name
,
name
));
History
.
Add
(
new
AscDFH
.
CChangesDrawings
String
(
this
,
AscDFH
.
historyitem_SlideLayoutSetCSldName
,
this
.
cSld
.
name
,
name
));
this
.
cSld
.
name
=
name
;
this
.
cSld
.
name
=
name
;
},
},
setShow
:
function
(
bShow
)
setShow
:
function
(
bShow
)
{
{
History
.
Add
(
new
AscDFH
.
CChangesDrawings
Object
(
this
,
AscDFH
.
historyitem_SlideLayoutSetShow
,
this
.
show
,
bShow
));
History
.
Add
(
new
AscDFH
.
CChangesDrawings
Bool
(
this
,
AscDFH
.
historyitem_SlideLayoutSetShow
,
this
.
show
,
bShow
));
this
.
show
=
bShow
;
this
.
show
=
bShow
;
},
},
setShowPhAnim
:
function
(
bShow
)
setShowPhAnim
:
function
(
bShow
)
{
{
History
.
Add
(
new
AscDFH
.
CChangesDrawings
Object
(
this
,
AscDFH
.
historyitem_SlideLayoutSetShowPhAnim
,
this
.
showMasterPhAnim
,
bShow
));
History
.
Add
(
new
AscDFH
.
CChangesDrawings
Bool
(
this
,
AscDFH
.
historyitem_SlideLayoutSetShowPhAnim
,
this
.
showMasterPhAnim
,
bShow
));
this
.
showMasterPhAnim
=
bShow
;
this
.
showMasterPhAnim
=
bShow
;
},
},
setShowMasterSp
:
function
(
bShow
)
setShowMasterSp
:
function
(
bShow
)
{
{
History
.
Add
(
new
AscDFH
.
CChangesDrawings
Object
(
this
,
AscDFH
.
historyitem_SlideLayoutSetShowMasterSp
,
this
.
showMasterSp
,
bShow
));
History
.
Add
(
new
AscDFH
.
CChangesDrawings
Bool
(
this
,
AscDFH
.
historyitem_SlideLayoutSetShowMasterSp
,
this
.
showMasterSp
,
bShow
));
this
.
showMasterSp
=
bShow
;
this
.
showMasterSp
=
bShow
;
},
},
...
...
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