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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
aadde87f
Commit
aadde87f
authored
Apr 19, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved keycodes constants to common lib file
updated markup to use buttons instead of links
parent
f1719de3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
13 deletions
+16
-13
app/assets/javascripts/ide/components/file_finder/index.vue
app/assets/javascripts/ide/components/file_finder/index.vue
+7
-5
app/assets/javascripts/ide/components/file_finder/item.vue
app/assets/javascripts/ide/components/file_finder/item.vue
+3
-3
app/assets/javascripts/ide/constants.js
app/assets/javascripts/ide/constants.js
+0
-4
app/assets/javascripts/lib/utils/keycodes.js
app/assets/javascripts/lib/utils/keycodes.js
+4
-0
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+1
-0
spec/javascripts/ide/components/file_finder/index_spec.js
spec/javascripts/ide/components/file_finder/index_spec.js
+1
-1
No files found.
app/assets/javascripts/ide/components/file_finder/index.vue
View file @
aadde87f
...
...
@@ -8,11 +8,13 @@ import {
MAX_FILE_FINDER_RESULTS
,
FILE_FINDER_ROW_HEIGHT
,
FILE_FINDER_EMPTY_ROW_HEIGHT
,
}
from
'
../../constants
'
;
import
{
UP_KEY_CODE
,
DOWN_KEY_CODE
,
ENTER_KEY_CODE
,
ESC_KEY_CODE
,
}
from
'
../../
constant
s
'
;
}
from
'
../../
../lib/utils/keycode
s
'
;
export
default
{
components
:
{
...
...
@@ -191,7 +193,7 @@ export default {
>
</i>
<i
role=
"button"
aria-hidden=
"true
"
:aria-label=
"__('Clear search input')
"
class=
"fa fa-times dropdown-input-clear"
:class=
"
{
show: showClearInputButton
...
...
@@ -225,16 +227,16 @@ export default {
</
template
>
<li
v-else
class=
"dropdown-menu-empty-item
hidden
"
class=
"dropdown-menu-empty-item"
>
<
a
href=
"#
"
>
<
div
class=
"append-right-default prepend-left-default prepend-top-8 append-bottom-8
"
>
<
template
v-if=
"loading"
>
{{
__
(
'
Loading...
'
)
}}
</
template
>
<
template
v-else
>
{{
__
(
'
No files found.
'
)
}}
</
template
>
</
a
>
</
div
>
</li>
</virtual-list>
</div>
...
...
app/assets/javascripts/ide/components/file_finder/item.vue
View file @
aadde87f
...
...
@@ -58,8 +58,8 @@ export default {
</
script
>
<
template
>
<
a
href=
"#
"
<
button
type=
"button
"
class=
"diff-changed-file"
:class=
"
{
'is-focused': focused,
...
...
@@ -109,5 +109,5 @@ export default {
:file=
"file"
/>
</span>
</
a
>
</
button
>
</
template
>
app/assets/javascripts/ide/constants.js
View file @
aadde87f
...
...
@@ -2,10 +2,6 @@
export
const
MAX_FILE_FINDER_RESULTS
=
40
;
export
const
FILE_FINDER_ROW_HEIGHT
=
55
;
export
const
FILE_FINDER_EMPTY_ROW_HEIGHT
=
33
;
export
const
UP_KEY_CODE
=
38
;
export
const
DOWN_KEY_CODE
=
40
;
export
const
ENTER_KEY_CODE
=
13
;
export
const
ESC_KEY_CODE
=
27
;
// Commit message textarea
export
const
MAX_TITLE_LENGTH
=
50
;
...
...
app/assets/javascripts/lib/utils/keycodes.js
0 → 100644
View file @
aadde87f
export
const
UP_KEY_CODE
=
38
;
export
const
DOWN_KEY_CODE
=
40
;
export
const
ENTER_KEY_CODE
=
13
;
export
const
ESC_KEY_CODE
=
27
;
app/assets/stylesheets/framework/common.scss
View file @
aadde87f
...
...
@@ -472,6 +472,7 @@ img.emoji {
.append-right-20
{
margin-right
:
20px
;
}
.append-bottom-0
{
margin-bottom
:
0
;
}
.append-bottom-5
{
margin-bottom
:
5px
;
}
.append-bottom-8
{
margin-bottom
:
$grid-size
;
}
.append-bottom-10
{
margin-bottom
:
10px
;
}
.append-bottom-15
{
margin-bottom
:
15px
;
}
.append-bottom-20
{
margin-bottom
:
20px
;
}
...
...
spec/javascripts/ide/components/file_finder/index_spec.js
View file @
aadde87f
import
Vue
from
'
vue
'
;
import
store
from
'
~/ide/stores
'
;
import
FindFileComponent
from
'
~/ide/components/file_finder/index.vue
'
;
import
{
UP_KEY_CODE
,
DOWN_KEY_CODE
,
ENTER_KEY_CODE
,
ESC_KEY_CODE
}
from
'
~/
ide/constant
s
'
;
import
{
UP_KEY_CODE
,
DOWN_KEY_CODE
,
ENTER_KEY_CODE
,
ESC_KEY_CODE
}
from
'
~/
lib/utils/keycode
s
'
;
import
router
from
'
~/ide/ide_router
'
;
import
{
file
,
resetStore
}
from
'
../../helpers
'
;
import
{
mountComponentWithStore
}
from
'
../../../helpers/vue_mount_component_helper
'
;
...
...
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