Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
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
Boxiang Sun
gitlab-ce
Commits
70bd90ba
Commit
70bd90ba
authored
Apr 18, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix mouseOver & arrow keys working at same time
parent
d9262b79
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
3 deletions
+16
-3
app/assets/javascripts/ide/components/file_finder/index.vue
app/assets/javascripts/ide/components/file_finder/index.vue
+16
-3
No files found.
app/assets/javascripts/ide/components/file_finder/index.vue
View file @
70bd90ba
...
@@ -24,6 +24,7 @@ export default {
...
@@ -24,6 +24,7 @@ export default {
focusedIndex
:
0
,
focusedIndex
:
0
,
searchText
:
''
,
searchText
:
''
,
mouseOver
:
false
,
mouseOver
:
false
,
cancelMouseOver
:
false
,
};
};
},
},
computed
:
{
computed
:
{
...
@@ -97,6 +98,7 @@ export default {
...
@@ -97,6 +98,7 @@ export default {
case
UP_KEY_CODE
:
case
UP_KEY_CODE
:
e
.
preventDefault
();
e
.
preventDefault
();
this
.
mouseOver
=
false
;
this
.
mouseOver
=
false
;
this
.
cancelMouseOver
=
true
;
if
(
this
.
focusedIndex
>
0
)
{
if
(
this
.
focusedIndex
>
0
)
{
this
.
focusedIndex
-=
1
;
this
.
focusedIndex
-=
1
;
}
else
{
}
else
{
...
@@ -106,6 +108,7 @@ export default {
...
@@ -106,6 +108,7 @@ export default {
case
DOWN_KEY_CODE
:
case
DOWN_KEY_CODE
:
e
.
preventDefault
();
e
.
preventDefault
();
this
.
mouseOver
=
false
;
this
.
mouseOver
=
false
;
this
.
cancelMouseOver
=
true
;
if
(
this
.
focusedIndex
<
this
.
filteredBlobsLength
-
1
)
{
if
(
this
.
focusedIndex
<
this
.
filteredBlobsLength
-
1
)
{
this
.
focusedIndex
+=
1
;
this
.
focusedIndex
+=
1
;
}
else
{
}
else
{
...
@@ -133,8 +136,13 @@ export default {
...
@@ -133,8 +136,13 @@ export default {
router
.
push
(
`/project
${
file
.
url
}
`
);
router
.
push
(
`/project
${
file
.
url
}
`
);
},
},
onMouseOver
(
index
)
{
onMouseOver
(
index
)
{
if
(
!
this
.
cancelMouseOver
)
{
this
.
mouseOver
=
true
;
this
.
mouseOver
=
true
;
this
.
focusedIndex
=
index
;
this
.
focusedIndex
=
index
;
}
},
onMouseMove
()
{
this
.
cancelMouseOver
=
false
;
},
},
},
},
};
};
...
@@ -144,6 +152,7 @@ export default {
...
@@ -144,6 +152,7 @@ export default {
<div
<div
class=
"ide-file-finder-overlay"
class=
"ide-file-finder-overlay"
@
mousedown.self=
"toggleFileFinder(false)"
@
mousedown.self=
"toggleFileFinder(false)"
@
mousemove=
"onMouseMove"
>
>
<div
<div
class=
"dropdown-menu diff-file-changes ide-file-finder show"
class=
"dropdown-menu diff-file-changes ide-file-finder show"
...
@@ -176,7 +185,11 @@ export default {
...
@@ -176,7 +185,11 @@ export default {
@click="clearSearchInput"
@click="clearSearchInput"
>
</i>
>
</i>
</div>
</div>
<div>
<div
:style=
"
{
'pointer-events': cancelMouseOver ? 'none' : ''
}"
>
<virtual-list
<virtual-list
:size=
"listHeight"
:size=
"listHeight"
:remain=
"listShowCount"
:remain=
"listShowCount"
...
...
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