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
f05aad1d
Commit
f05aad1d
authored
Jun 17, 2016
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Исправлен баг с получением текстовых настроек в сноске.
parent
2c6a6f3c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
33 deletions
+34
-33
word/Editor/Document.js
word/Editor/Document.js
+33
-32
word/Editor/Footnotes.js
word/Editor/Footnotes.js
+1
-1
No files found.
word/Editor/Document.js
View file @
f05aad1d
...
@@ -4186,7 +4186,7 @@ CDocument.prototype.Set_ParagraphTabs = function(Tabs)
...
@@ -4186,7 +4186,7 @@ CDocument.prototype.Set_ParagraphTabs = function(Tabs)
this
.
Recalculate
();
this
.
Recalculate
();
this
.
Document_UpdateSelectionState
();
this
.
Document_UpdateSelectionState
();
this
.
Document_UpdateInterfaceState
();
this
.
Document_UpdateInterfaceState
();
editor
.
Update_ParaTab
(
Default_Tab_Stop
,
Tabs
);
this
.
Api
.
Update_ParaTab
(
Default_Tab_Stop
,
Tabs
);
};
};
CDocument
.
prototype
.
Set_ParagraphIndent
=
function
(
Ind
)
CDocument
.
prototype
.
Set_ParagraphIndent
=
function
(
Ind
)
{
{
...
@@ -4569,21 +4569,20 @@ CDocument.prototype.Interface_Update_TextPr = function()
...
@@ -4569,21 +4569,20 @@ CDocument.prototype.Interface_Update_TextPr = function()
*/
*/
CDocument
.
prototype
.
Interface_Update_DrawingPr
=
function
(
Flag
)
CDocument
.
prototype
.
Interface_Update_DrawingPr
=
function
(
Flag
)
{
{
// if(!(this.DrawingObjects.curState.id === STATES_ID_TEXT_ADD || this.DrawingObjects.curState.id === STATES_ID_TEXT_ADD_IN_GROUP))
var
DrawingPr
=
this
.
DrawingObjects
.
Get_Props
();
{
var
DrawingPr
=
this
.
DrawingObjects
.
Get_Props
();
if
(
true
===
Flag
)
return
DrawingPr
;
else
{
for
(
var
i
=
0
;
i
<
DrawingPr
.
length
;
++
i
)
if
(
true
===
Flag
)
editor
.
sync_ImgPropCallback
(
DrawingPr
[
i
]);
return
DrawingPr
;
}
else
}
{
if
(
Flag
)
if
(
this
.
Api
)
return
null
;
{
for
(
var
i
=
0
;
i
<
DrawingPr
.
length
;
++
i
)
this
.
Api
.
sync_ImgPropCallback
(
DrawingPr
[
i
]);
}
}
if
(
Flag
)
return
null
;
};
};
/**
/**
* Обновляем данные в интерфейсе о свойствах таблицы.
* Обновляем данные в интерфейсе о свойствах таблицы.
...
@@ -4592,30 +4591,32 @@ CDocument.prototype.Interface_Update_DrawingPr = function(Flag)
...
@@ -4592,30 +4591,32 @@ CDocument.prototype.Interface_Update_DrawingPr = function(Flag)
*/
*/
CDocument
.
prototype
.
Interface_Update_TablePr
=
function
(
Flag
)
CDocument
.
prototype
.
Interface_Update_TablePr
=
function
(
Flag
)
{
{
var
TablePr
=
null
;
var
TablePr
=
null
;
if
(
docpostype_Content
==
this
.
CurPos
.
Type
&&
(
(
true
===
this
.
Selection
.
Use
&&
this
.
Selection
.
StartPos
==
this
.
Selection
.
EndPos
&&
type_Table
==
this
.
Content
[
this
.
Selection
.
StartPos
].
GetType
()
)
||
(
false
==
this
.
Selection
.
Use
&&
type_Table
==
this
.
Content
[
this
.
CurPos
.
ContentPos
].
GetType
()
)
))
if
(
docpostype_Content
==
this
.
Get_DocPosType
()
{
&&
((
true
===
this
.
Selection
.
Use
&&
this
.
Selection
.
StartPos
==
this
.
Selection
.
EndPos
&&
type_Table
==
this
.
Content
[
this
.
Selection
.
StartPos
].
GetType
())
if
(
true
==
this
.
Selection
.
Use
)
||
(
false
==
this
.
Selection
.
Use
&&
type_Table
==
this
.
Content
[
this
.
CurPos
.
ContentPos
].
GetType
())))
TablePr
=
this
.
Content
[
this
.
Selection
.
StartPos
].
Get_Props
();
{
else
if
(
true
==
this
.
Selection
.
Use
)
TablePr
=
this
.
Content
[
this
.
CurPos
.
ContentPos
].
Get_Props
();
TablePr
=
this
.
Content
[
this
.
Selection
.
StartPos
].
Get_Props
();
}
else
TablePr
.
CanBeFlow
=
true
;
TablePr
=
this
.
Content
[
this
.
CurPos
.
ContentPos
].
Get_Props
();
}
TablePr
.
CanBeFlow
=
true
;
if
(
true
===
Flag
)
if
(
true
===
Flag
)
return
TablePr
;
return
TablePr
;
else
if
(
null
!=
TablePr
)
else
if
(
null
!=
TablePr
)
editor
.
sync_TblPropCallback
(
TablePr
);
this
.
Api
.
sync_TblPropCallback
(
TablePr
);
};
};
/**
/**
* Обновляем данные в интерфейсе о свойствах колонотитулов.
* Обновляем данные в интерфейсе о свойствах колонотитулов.
*/
*/
CDocument
.
prototype
.
Interface_Update_HdrFtrPr
=
function
()
CDocument
.
prototype
.
Interface_Update_HdrFtrPr
=
function
()
{
{
if
(
docpostype_HdrFtr
===
this
.
CurPos
.
Type
)
if
(
docpostype_HdrFtr
===
this
.
Get_DocPosType
()
)
{
{
editor
.
sync_HeadersAndFootersPropCallback
(
this
.
HdrFtr
.
Get_Props
());
this
.
Api
.
sync_HeadersAndFootersPropCallback
(
this
.
HdrFtr
.
Get_Props
());
}
}
};
};
CDocument
.
prototype
.
Internal_GetContentPosByXY
=
function
(
X
,
Y
,
PageNum
,
ColumnsInfo
)
CDocument
.
prototype
.
Internal_GetContentPosByXY
=
function
(
X
,
Y
,
PageNum
,
ColumnsInfo
)
{
{
...
...
word/Editor/Footnotes.js
View file @
f05aad1d
...
@@ -762,7 +762,7 @@ CFootnotesController.prototype.GetCurrentTextPr = function()
...
@@ -762,7 +762,7 @@ CFootnotesController.prototype.GetCurrentTextPr = function()
else
else
{
{
if
(
null
!==
this
.
CurFootnote
)
if
(
null
!==
this
.
CurFootnote
)
return
this
.
CurFootnote
.
Get_Paragraph_
Para
Pr
();
return
this
.
CurFootnote
.
Get_Paragraph_
Text
Pr
();
}
}
return
null
;
return
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