Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
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
web-apps
Commits
cbc70b1c
Commit
cbc70b1c
authored
Jul 22, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] fixed bug 32671
parent
cb452508
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
9 deletions
+14
-9
apps/common/main/lib/extend/Bootstrap.js
apps/common/main/lib/extend/Bootstrap.js
+11
-7
apps/spreadsheeteditor/main/app/controller/CellEditor.js
apps/spreadsheeteditor/main/app/controller/CellEditor.js
+3
-2
No files found.
apps/common/main/lib/extend/Bootstrap.js
View file @
cbc70b1c
...
...
@@ -49,12 +49,14 @@ function onDropDownKeyDown(e) {
if
(
$parent
.
hasClass
(
'
no-stop-propagate
'
))
{
if
(
arguments
.
length
>
1
&&
arguments
[
1
]
instanceof
KeyboardEvent
)
e
=
arguments
[
1
];
if
(
/^
(
38|40|27|13|9
)
$/
.
test
(
e
.
keyCode
)
&&
!
e
.
ctrlKey
&&
!
e
.
altKey
)
{
if
(
/^
(
38|40|27|13|9
|37|39
)
$/
.
test
(
e
.
keyCode
)
&&
!
e
.
ctrlKey
&&
!
e
.
altKey
)
{
patchDropDownKeyDownAdditional
.
call
(
this
,
e
);
if
(
!
/
(
37|39
)
/
.
test
(
e
.
keyCode
))
{
e
.
preventDefault
();
e
.
stopPropagation
();
}
}
else
if
(
!
$parent
.
hasClass
(
'
no-stop-propagate
'
)
||
/^
(
38|40|27|13|9
)
$/
.
test
(
e
.
keyCode
)
&&
!
e
.
ctrlKey
&&
!
e
.
altKey
)
{
}
}
else
{
patchDropDownKeyDown
.
call
(
this
,
e
);
e
.
preventDefault
();
e
.
stopPropagation
();
...
...
@@ -142,15 +144,17 @@ function patchDropDownKeyDownAdditional(e) { // only for formula menu when typin
var
$this
=
$
(
this
);
if
(
!
/
(
37|39
)
/
.
test
(
e
.
keyCode
))
{
e
.
preventDefault
();
e
.
stopPropagation
();
}
if
(
$this
.
is
(
'
.disabled, :disabled
'
))
return
;
var
$parent
=
getParent
(
$this
);
var
isActive
=
$parent
.
hasClass
(
'
open
'
)
||
$parent
.
hasClass
(
'
over
'
);
if
(
!
isActive
||
(
isActive
&&
e
.
keyCode
==
27
))
{
if
(
!
isActive
||
(
isActive
&&
(
e
.
keyCode
==
27
||
e
.
keyCode
==
37
||
e
.
keyCode
==
39
)
))
{
// if (e.which == 27)
// $parent.find('[data-toggle=dropdown]').focus();
return
(
isActive
)
?
$this
.
click
()
:
undefined
;
...
...
apps/spreadsheeteditor/main/app/controller/CellEditor.js
View file @
cbc70b1c
...
...
@@ -95,7 +95,8 @@ define([
onInputKeyDown
:
function
(
e
)
{
if
(
Common
.
UI
.
Keys
.
UP
===
e
.
keyCode
||
Common
.
UI
.
Keys
.
DOWN
===
e
.
keyCode
||
Common
.
UI
.
Keys
.
TAB
===
e
.
keyCode
||
Common
.
UI
.
Keys
.
RETURN
===
e
.
keyCode
||
Common
.
UI
.
Keys
.
ESC
===
e
.
keyCode
)
{
Common
.
UI
.
Keys
.
TAB
===
e
.
keyCode
||
Common
.
UI
.
Keys
.
RETURN
===
e
.
keyCode
||
Common
.
UI
.
Keys
.
ESC
===
e
.
keyCode
||
Common
.
UI
.
Keys
.
LEFT
===
e
.
keyCode
||
Common
.
UI
.
Keys
.
RIGHT
===
e
.
keyCode
)
{
var
menu
=
$
(
'
#menu-formula-selection
'
);
// for formula menu
if
(
menu
.
hasClass
(
'
open
'
))
menu
.
find
(
'
.dropdown-menu
'
).
trigger
(
'
keydown
'
,
e
);
...
...
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