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
cbe51d70
Commit
cbe51d70
authored
Jul 08, 2016
by
Sergey Luzyanin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://github.com/ONLYOFFICE/sdkjs
into develop
parents
5ca5094c
8bf55a24
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2687 additions
and
2639 deletions
+2687
-2639
cell/apiDefines.js
cell/apiDefines.js
+1
-1
common/Drawings/WorkEvents.js
common/Drawings/WorkEvents.js
+2660
-2636
word/Editor/Document.js
word/Editor/Document.js
+26
-2
No files found.
cell/apiDefines.js
View file @
cbe51d70
...
...
@@ -220,7 +220,7 @@ var c_oAscDynamicAutoFilter = {
var
c_oAscTop10AutoFilter
=
{
max
:
1
,
min
:
2
}
}
;
var
c_oAscChangeFilterOptions
=
{
filter
:
1
,
...
...
common/Drawings/WorkEvents.js
View file @
cbe51d70
This diff is collapsed.
Click to expand it.
word/Editor/Document.js
View file @
cbe51d70
...
...
@@ -6790,6 +6790,22 @@ CDocument.prototype.OnKeyDown = function(e)
this
.
Document_UpdateInterfaceState
();
bRetValue
=
keydownresult_PreventAll
;
}
else
if
(
e
.
KeyCode
==
12288
&&
false
===
editor
.
isViewMode
)
// Space
{
if
(
false
===
this
.
Document_Is_SelectionLocked
(
changestype_Paragraph_Content
,
null
,
true
))
{
this
.
Create_NewHistoryPoint
(
AscDFH
.
historydescription_Document_SpaceButton
);
this
.
DrawingDocument
.
TargetStart
();
this
.
DrawingDocument
.
TargetShow
();
this
.
CheckLanguageOnTextAdd
=
true
;
this
.
Paragraph_Add
(
new
ParaSpace
());
this
.
CheckLanguageOnTextAdd
=
false
;
}
bRetValue
=
keydownresult_PreventAll
;
}
// Если был пересчет, значит были изменения, а вместе с ними пересылается и новая позиция курсора
if
(
bRetValue
&
keydownresult_PreventKeyPress
&&
OldRecalcId
===
this
.
RecalcId
)
...
...
@@ -11086,8 +11102,16 @@ CDocument.prototype.Add_CompositeText = function(nCharCode)
var
oRun
=
this
.
CompositeInput
.
Run
;
var
nPos
=
this
.
CompositeInput
.
Pos
+
this
.
CompositeInput
.
Length
;
var
oChar
=
new
ParaText
();
oChar
.
Set_CharCode
(
nCharCode
);
var
oChar
;
if
(
32
==
nCharCode
||
12288
==
nCharCode
)
{
oChar
=
new
ParaSpace
();
}
else
{
oChar
=
new
ParaText
();
oChar
.
Set_CharCode
(
nCharCode
);
}
oRun
.
Add_ToContent
(
nPos
,
oChar
,
true
);
this
.
CompositeInput
.
Length
++
;
...
...
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