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
cbce6e6d
Commit
cbce6e6d
authored
Jan 20, 2017
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug #33550
parent
1722b97e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
word/Editor/Document.js
word/Editor/Document.js
+2
-1
word/Editor/FootEndNote.js
word/Editor/FootEndNote.js
+5
-0
word/Editor/Footnotes.js
word/Editor/Footnotes.js
+9
-1
No files found.
word/Editor/Document.js
View file @
cbce6e6d
...
@@ -9502,7 +9502,7 @@ CDocument.prototype.private_StartSelectionFromCurPos = function()
...
@@ -9502,7 +9502,7 @@ CDocument.prototype.private_StartSelectionFromCurPos = function()
Y
=
_Y
;
Y
=
_Y
;
}
}
this
.
CurPage
=
CurPara
.
Get_
StartPage_Absolute
()
+
CurPara
.
CurPos
.
PagesPos
;
this
.
CurPage
=
CurPara
.
Get_
CurrentPage_Absolute
()
;
this
.
Selection_SetStart
(
X
,
Y
,
MouseEvent
);
this
.
Selection_SetStart
(
X
,
Y
,
MouseEvent
);
MouseEvent
.
Type
=
AscCommon
.
g_mouse_event_type_move
;
MouseEvent
.
Type
=
AscCommon
.
g_mouse_event_type_move
;
this
.
Selection_SetEnd
(
X
,
Y
,
MouseEvent
);
this
.
Selection_SetEnd
(
X
,
Y
,
MouseEvent
);
...
@@ -12725,6 +12725,7 @@ CDocument.prototype.controller_MoveCursorUp = function(AddToSelect)
...
@@ -12725,6 +12725,7 @@ CDocument.prototype.controller_MoveCursorUp = function(AddToSelect)
this
.
private_UpdateCursorXY
(
false
,
true
);
this
.
private_UpdateCursorXY
(
false
,
true
);
var
Result
=
this
.
private_MoveCursorUp
(
this
.
CurPos
.
RealX
,
this
.
CurPos
.
RealY
,
AddToSelect
);
var
Result
=
this
.
private_MoveCursorUp
(
this
.
CurPos
.
RealX
,
this
.
CurPos
.
RealY
,
AddToSelect
);
// TODO: Вообще Word селектит до начала данной колонки в таком случае, а не до начала документа
if
(
true
===
AddToSelect
&&
true
!==
Result
)
if
(
true
===
AddToSelect
&&
true
!==
Result
)
this
.
Cursor_MoveToStartPos
(
true
);
this
.
Cursor_MoveToStartPos
(
true
);
...
...
word/Editor/FootEndNote.js
View file @
cbce6e6d
...
@@ -177,6 +177,11 @@ CFootEndnote.prototype.OnFastRecalculate = function()
...
@@ -177,6 +177,11 @@ CFootEndnote.prototype.OnFastRecalculate = function()
{
{
this
.
NeedUpdateHint
=
true
;
this
.
NeedUpdateHint
=
true
;
};
};
CFootEndnote
.
prototype
.
Get_ColumnFields
=
function
(
ElementIndex
,
ColumnIndex
)
{
var
PageAbs
=
this
.
Get_StartPage_Absolute
();
return
this
.
Parent
.
GetColumnFields
(
PageAbs
,
ColumnIndex
);
};
//--------------------------------------------------------export----------------------------------------------------
//--------------------------------------------------------export----------------------------------------------------
window
[
'
AscCommonWord
'
]
=
window
[
'
AscCommonWord
'
]
||
{};
window
[
'
AscCommonWord
'
]
=
window
[
'
AscCommonWord
'
]
||
{};
...
...
word/Editor/Footnotes.js
View file @
cbce6e6d
...
@@ -219,7 +219,7 @@ CFootnotesController.prototype.Reset = function(nPageIndex, oSectPr)
...
@@ -219,7 +219,7 @@ CFootnotesController.prototype.Reset = function(nPageIndex, oSectPr)
_X
+=
oSectPr
.
Get_ColumnSpace
(
nTempColumnIndex
);
_X
+=
oSectPr
.
Get_ColumnSpace
(
nTempColumnIndex
);
}
}
var
_XLimit
=
(
nColumnsCount
-
1
!==
nColumnIndex
?
X
+
oSectPr
.
Get_ColumnWidth
(
nColumnIndex
)
:
XLimit
);
var
_XLimit
=
(
nColumnsCount
-
1
!==
nColumnIndex
?
_
X
+
oSectPr
.
Get_ColumnWidth
(
nColumnIndex
)
:
XLimit
);
var
oColumn
=
new
CFootEndnotePageColumn
();
var
oColumn
=
new
CFootEndnotePageColumn
();
oColumn
.
X
=
_X
;
oColumn
.
X
=
_X
;
...
@@ -3113,6 +3113,14 @@ CFootnotesController.prototype.GetCurrentSectionPr = function()
...
@@ -3113,6 +3113,14 @@ CFootnotesController.prototype.GetCurrentSectionPr = function()
{
{
return
null
;
return
null
;
};
};
CFootnotesController
.
prototype
.
GetColumnFields
=
function
(
nPageAbs
,
nColumnAbs
)
{
var
oColumn
=
this
.
private_GetPageColumn
(
nPageAbs
,
nColumnAbs
);
if
(
!
oColumn
)
return
{
X
:
0
,
XLimit
:
297
};
return
{
X
:
oColumn
.
X
,
XLimit
:
oColumn
.
XLimit
};
};
function
CFootEndnotePageColumn
()
function
CFootEndnotePageColumn
()
...
...
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