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
a02b7b1c
Commit
a02b7b1c
authored
Feb 01, 2017
by
Alexander Trofimov
Committed by
GitHub
Feb 01, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #100 from ONLYOFFICE/hotfix/v4.2.8
fix bug 33908
parents
af8980a6
3669611c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
cell/view/CellEditorView.js
cell/view/CellEditorView.js
+1
-2
cell/view/EventsController.js
cell/view/EventsController.js
+1
-4
No files found.
cell/view/CellEditorView.js
View file @
a02b7b1c
...
@@ -2513,7 +2513,6 @@
...
@@ -2513,7 +2513,6 @@
/** @param event {KeyboardEvent} */
/** @param event {KeyboardEvent} */
CellEditor
.
prototype
.
_onWindowKeyPress
=
function
(
event
)
{
CellEditor
.
prototype
.
_onWindowKeyPress
=
function
(
event
)
{
var
t
=
this
;
var
t
=
this
;
var
ctrlKey
=
event
.
metaKey
||
event
.
ctrlKey
;
if
(
!
window
[
'
IS_NATIVE_EDITOR
'
])
{
if
(
!
window
[
'
IS_NATIVE_EDITOR
'
])
{
...
@@ -2521,7 +2520,7 @@
...
@@ -2521,7 +2520,7 @@
return
true
;
return
true
;
}
}
if
(
t
.
skipKeyPress
||
event
.
which
<
32
||
event
.
altKey
||
ctrlKey
)
{
if
(
t
.
skipKeyPress
||
event
.
which
<
32
)
{
t
.
skipKeyPress
=
true
;
t
.
skipKeyPress
=
true
;
return
true
;
return
true
;
}
}
...
...
cell/view/EventsController.js
View file @
a02b7b1c
...
@@ -1032,10 +1032,7 @@
...
@@ -1032,10 +1032,7 @@
return
result
;
return
result
;
default
:
default
:
// При зажатом Ctrl или Alt не вводим символ
t
.
skipKeyPress
=
false
;
if
(
!
ctrlKey
&&
!
event
.
altKey
)
{
t
.
skipKeyPress
=
false
;
}
return
true
;
return
true
;
}
// end of switch
}
// end of switch
...
...
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