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
e38c70ef
Commit
e38c70ef
authored
Sep 21, 2016
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added functions for working with special footnotes.
parent
84e33633
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
150 additions
and
22 deletions
+150
-22
common/Drawings/Format/Constants.js
common/Drawings/Format/Constants.js
+4
-1
word/Editor/Document.js
word/Editor/Document.js
+2
-2
word/Editor/Footnotes.js
word/Editor/Footnotes.js
+144
-19
No files found.
common/Drawings/Format/Constants.js
View file @
e38c70ef
...
...
@@ -2362,7 +2362,10 @@
window
[
'
AscDFH
'
].
historyitem_Math_BoxForcedBreak
=
56
;
window
[
'
AscDFH
'
].
historyitem_Math_DegreeSubSupType
=
57
;
window
[
'
AscDFH
'
].
historyitem_Footnotes_AddFootnote
=
1
;
window
[
'
AscDFH
'
].
historyitem_Footnotes_AddFootnote
=
1
;
window
[
'
AscDFH
'
].
historyitem_Footnotes_SetSeparator
=
2
;
window
[
'
AscDFH
'
].
historyitem_Footnotes_SetContinuationSeparator
=
3
;
window
[
'
AscDFH
'
].
historyitem_Footnotes_SetContinuationNotice
=
4
;
window
[
'
AscDFH
'
].
historydescription_Cut
=
0x0001
;
window
[
'
AscDFH
'
].
historydescription_PasteButtonIE
=
0x0002
;
...
...
word/Editor/Document.js
View file @
e38c70ef
...
...
@@ -1550,7 +1550,7 @@ CDocument.prototype.On_EndLoad = function()
this
.
Set_FastCollaborativeEditing
(
true
);
}
//this.Footnotes.
Init
();
//this.Footnotes.
ResetSpecialFootnotes
();
};
CDocument
.
prototype
.
Add_TestDocument
=
function
()
{
...
...
@@ -11417,7 +11417,7 @@ CDocument.prototype.AddFootnote = function()
var
nDocPosType
=
this
.
Get_DocPosType
();
if
(
docpostype_Content
===
nDocPosType
)
{
var
oFootnote
=
this
.
Footnotes
.
Create
_
Footnote
();
var
oFootnote
=
this
.
Footnotes
.
CreateFootnote
();
oFootnote
.
Paragraph_Add
(
new
ParaFootnoteRef
(
oFootnote
));
oFootnote
.
Paragraph_Add
(
new
ParaSpace
());
oFootnote
.
Cursor_MoveToEndPos
(
false
);
...
...
word/Editor/Footnotes.js
View file @
e38c70ef
...
...
@@ -47,8 +47,6 @@ function CFootnotesController(LogicDocument)
this
.
Footnote
=
{};
// Список всех сносок с ключом - Id.
this
.
Pages
=
[];
this
.
NeedShift
=
false
;
// Нужно ли делать перенос после пересчета.
// Специальные сноски
this
.
ContinuationNoticeFootnote
=
null
;
this
.
ContinuationSeparatorFootnote
=
null
;
...
...
@@ -57,14 +55,14 @@ function CFootnotesController(LogicDocument)
this
.
Selection
=
{
Use
:
false
,
Start
:
{
Footnote
:
null
,
Page
:
0
,
Index
:
0
Footnote
:
null
,
Page
:
0
,
Index
:
0
},
End
:
{
Footnote
:
null
,
Page
:
0
,
Index
:
0
Footnote
:
null
,
Page
:
0
,
Index
:
0
},
Footnotes
:
{},
Direction
:
0
...
...
@@ -90,33 +88,76 @@ CFootnotesController.prototype.Get_Id = function()
/**
* Начальная инициализация после загрузки всех файлов.
*/
CFootnotesController
.
prototype
.
Init
=
function
()
CFootnotesController
.
prototype
.
ResetSpecialFootnotes
=
function
()
{
this
.
SeparatorFootnote
=
new
CFootEndnote
(
this
);
this
.
SeparatorFootnote
.
Paragraph_Add
(
new
ParaSeparator
(),
false
);
var
oParagraph
=
this
.
SeparatorFootnote
.
Get_ElementByIndex
(
0
);
var
oSeparator
=
new
CFootEndnote
(
this
);
oSeparator
.
Paragraph_Add
(
new
ParaSeparator
(),
false
);
var
oParagraph
=
oSeparator
.
Get_ElementByIndex
(
0
);
oParagraph
.
Set_Spacing
({
After
:
0
,
Line
:
1
,
LineRule
:
Asc
.
linerule_Auto
},
false
);
this
.
SetSeparator
(
oSeparator
);
this
.
ContinuationSeparatorFootnote
=
new
CFootEndnote
(
this
);
this
.
ContinuationSeparatorFootnote
.
Paragraph_Add
(
new
ParaContinuationSeparator
(),
false
);
oParagraph
=
this
.
ContinuationSeparatorFootnote
.
Get_ElementByIndex
(
0
);
var
oContinuationSeparator
=
new
CFootEndnote
(
this
);
oContinuationSeparator
.
Paragraph_Add
(
new
ParaContinuationSeparator
(),
false
);
oParagraph
=
oContinuationSeparator
.
Get_ElementByIndex
(
0
);
oParagraph
.
Set_Spacing
({
After
:
0
,
Line
:
1
,
LineRule
:
Asc
.
linerule_Auto
},
false
);
this
.
SetContinuationSeparator
(
oContinuationSeparator
);
this
.
SetContinuationNotice
(
null
);
};
/**
* Создаем новую сноску.
* @returns {CFootEndnote}
*/
CFootnotesController
.
prototype
.
Create
_
Footnote
=
function
()
CFootnotesController
.
prototype
.
CreateFootnote
=
function
()
{
var
NewFootnote
=
new
CFootEndnote
(
this
);
this
.
Footnote
[
NewFootnote
.
Get_Id
()]
=
NewFootnote
;
var
oHistory
=
this
.
LogicDocument
.
Get_History
();
oHistory
.
Add
(
this
,
{
Type
:
AscDFH
.
historyitem_Footnotes_AddFootnote
,
Id
:
NewFootnote
.
Get_Id
()});
return
NewFootnote
;
};
/**
* Добавляем сноску (функция для открытия файла)
* @param oFootnote
*/
CFootnotesController
.
prototype
.
AddFootnote
=
function
(
oFootnote
)
{
this
.
Footnote
[
oFootnote
.
Get_Id
()]
=
oFootnote
;
var
oHistory
=
this
.
LogicDocument
.
Get_History
();
oHistory
.
Add
(
this
,
{
Type
:
AscDFH
.
historyitem_Footnotes_AddFootnote
,
Id
:
oFootnote
.
Get_Id
()});
};
CFootnotesController
.
prototype
.
SetSeparator
=
function
(
oFootnote
)
{
var
oNewValue
=
oFootnote
?
oFootnote
:
null
;
var
oOldValue
=
this
.
SeparatorFootnote
?
this
.
SeparatorFootnote
:
null
;
var
oHistory
=
this
.
LogicDocument
.
Get_History
();
oHistory
.
Add
(
this
,
{
Type
:
AscDFH
.
historyitem_Footnotes_SetSeparator
,
New
:
oNewValue
,
Old
:
oOldValue
});
this
.
SeparatorFootnote
=
oNewValue
;
};
CFootnotesController
.
prototype
.
SetContinuationSeparator
=
function
(
oFootnote
)
{
var
oNewValue
=
oFootnote
?
oFootnote
:
null
;
var
oOldValue
=
this
.
ContinuationSeparatorFootnote
?
this
.
ContinuationSeparatorFootnote
:
null
;
var
oHistory
=
this
.
LogicDocument
.
Get_History
();
oHistory
.
Add
(
this
,
{
Type
:
AscDFH
.
historyitem_Footnotes_SetContinuationSeparator
,
New
:
oNewValue
,
Old
:
oOldValue
});
this
.
ContinuationSeparatorFootnote
=
oNewValue
;
};
CFootnotesController
.
prototype
.
SetContinuationNotice
=
function
(
oFootnote
)
{
var
oNewValue
=
oFootnote
?
oFootnote
:
null
;
var
oOldValue
=
this
.
ContinuationNoticeFootnote
?
this
.
ContinuationNoticeFootnote
:
null
;
var
oHistory
=
this
.
LogicDocument
.
Get_History
();
oHistory
.
Add
(
this
,
{
Type
:
AscDFH
.
historyitem_Footnotes_SetContinuationNotice
,
New
:
oNewValue
,
Old
:
oOldValue
});
this
.
ContinuationNoticeFootnote
=
oNewValue
;
};
/**
* Сбрасываем рассчетные данный для заданной страницы.
* @param {number} nPageIndex
...
...
@@ -793,6 +834,21 @@ CFootnotesController.prototype.Undo = function(Data)
this
.
Footnote
[
Data
.
Id
]
=
g_oTableId
.
Get_ById
(
Data
.
Id
);
break
;
}
case
AscDFH
.
historyitem_Footnotes_SetSeparator
:
{
this
.
SeparatorFootnote
=
Data
.
Old
;
break
;
}
case
AscDFH
.
historyitem_Footnotes_SetContinuationSeparator
:
{
this
.
ContinuationSeparatorFootnote
=
Data
.
Old
;
break
;
}
case
AscDFH
.
historyitem_Footnotes_SetContinuationNotice
:
{
this
.
ContinuationNoticeFootnote
=
Data
.
Old
;
break
;
}
}
};
CFootnotesController
.
prototype
.
Redo
=
function
(
Data
)
...
...
@@ -806,6 +862,21 @@ CFootnotesController.prototype.Redo = function(Data)
delete
this
.
Footnote
[
Data
.
Id
];
break
;
}
case
AscDFH
.
historyitem_Footnotes_SetSeparator
:
{
this
.
SeparatorFootnote
=
Data
.
New
;
break
;
}
case
AscDFH
.
historyitem_Footnotes_SetContinuationSeparator
:
{
this
.
ContinuationSeparatorFootnote
=
Data
.
New
;
break
;
}
case
AscDFH
.
historyitem_Footnotes_SetContinuationNotice
:
{
this
.
ContinuationNoticeFootnote
=
Data
.
New
;
break
;
}
}
};
CFootnotesController
.
prototype
.
Save_Changes
=
function
(
Data
,
Writer
)
...
...
@@ -829,6 +900,21 @@ CFootnotesController.prototype.Save_Changes = function(Data, Writer)
Writer
.
WriteString2
(
Data
.
Id
);
break
;
}
case
AscDFH
.
historyitem_Footnotes_SetSeparator
:
case
AscDFH
.
historyitem_Footnotes_SetContinuationSeparator
:
case
AscDFH
.
historyitem_Footnotes_SetContinuationNotice
:
{
if
(
Data
.
New
)
{
Writer
.
WriteBool
(
false
);
Writer
.
WriteString2
(
Data
.
New
.
Get_Id
());
}
else
{
Writer
.
WriteBool
(
true
);
}
break
;
}
}
return
Writer
;
...
...
@@ -853,10 +939,49 @@ CFootnotesController.prototype.Load_Changes = function(Reader, Reader2)
case
AscDFH
.
historyitem_Footnotes_AddFootnote
:
{
// String : Id
var
Id
=
Reader
.
GetString2
();
var
Id
=
Reader
.
GetString2
();
this
.
Footnote
[
Id
]
=
g_oTableId
.
Get_ById
(
Id
);
break
;
}
case
AscDFH
.
historyitem_Footnotes_SetSeparator
:
{
if
(
false
===
Reader
.
GetBool
())
{
var
Id
=
Reader
.
GetString2
();
this
.
SeparatorFootnote
=
g_oTableId
.
Get_ById
(
Id
);
}
else
{
this
.
SeparatorFootnote
=
null
;
}
break
;
}
case
AscDFH
.
historyitem_Footnotes_SetContinuationSeparator
:
{
if
(
false
===
Reader
.
GetBool
())
{
var
Id
=
Reader
.
GetString2
();
this
.
ContinuationSeparatorFootnote
=
g_oTableId
.
Get_ById
(
Id
);
}
else
{
this
.
ContinuationSeparatorFootnote
=
null
;
}
break
;
}
case
AscDFH
.
historyitem_Footnotes_SetContinuationNotice
:
{
if
(
false
===
Reader
.
GetBool
())
{
var
Id
=
Reader
.
GetString2
();
this
.
ContinuationNoticeFootnote
=
g_oTableId
.
Get_ById
(
Id
);
}
else
{
this
.
ContinuationNoticeFootnote
=
null
;
}
break
;
}
}
return
true
;
...
...
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