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
d2dcfe5f
Commit
d2dcfe5f
authored
Jun 05, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added missing button type
moved values to constants
parent
deaf4f72
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
app/assets/javascripts/ide/components/jobs/detail.vue
app/assets/javascripts/ide/components/jobs/detail.vue
+5
-2
app/assets/javascripts/ide/components/jobs/detail/scroll_button.vue
.../javascripts/ide/components/jobs/detail/scroll_button.vue
+7
-2
app/assets/javascripts/ide/components/jobs/item.vue
app/assets/javascripts/ide/components/jobs/item.vue
+1
-0
No files found.
app/assets/javascripts/ide/components/jobs/detail.vue
View file @
d2dcfe5f
...
@@ -40,11 +40,14 @@ export default {
...
@@ -40,11 +40,14 @@ export default {
methods
:
{
methods
:
{
...
mapActions
(
'
pipelines
'
,
[
'
fetchJobTrace
'
,
'
setDetailJob
'
]),
...
mapActions
(
'
pipelines
'
,
[
'
fetchJobTrace
'
,
'
setDetailJob
'
]),
scrollDown
()
{
scrollDown
()
{
if
(
this
.
$refs
.
buildTrace
)
if
(
this
.
$refs
.
buildTrace
)
{
this
.
$refs
.
buildTrace
.
scrollTo
(
0
,
this
.
$refs
.
buildTrace
.
scrollHeight
);
this
.
$refs
.
buildTrace
.
scrollTo
(
0
,
this
.
$refs
.
buildTrace
.
scrollHeight
);
}
},
},
scrollUp
()
{
scrollUp
()
{
if
(
this
.
$refs
.
buildTrace
)
this
.
$refs
.
buildTrace
.
scrollTo
(
0
,
0
);
if
(
this
.
$refs
.
buildTrace
)
{
this
.
$refs
.
buildTrace
.
scrollTo
(
0
,
0
);
}
},
},
scrollBuildLog
:
_
.
throttle
(
function
buildLogScrollDebounce
()
{
scrollBuildLog
:
_
.
throttle
(
function
buildLogScrollDebounce
()
{
const
{
scrollTop
}
=
this
.
$refs
.
buildTrace
;
const
{
scrollTop
}
=
this
.
$refs
.
buildTrace
;
...
...
app/assets/javascripts/ide/components/jobs/detail/scroll_button.vue
View file @
d2dcfe5f
...
@@ -3,6 +3,11 @@ import { __ } from '../../../../locale';
...
@@ -3,6 +3,11 @@ import { __ } from '../../../../locale';
import
Icon
from
'
../../../../vue_shared/components/icon.vue
'
;
import
Icon
from
'
../../../../vue_shared/components/icon.vue
'
;
import
tooltip
from
'
../../../../vue_shared/directives/tooltip
'
;
import
tooltip
from
'
../../../../vue_shared/directives/tooltip
'
;
const
directions
=
{
up
:
'
up
'
,
down
:
'
down
'
,
};
export
default
{
export
default
{
directives
:
{
directives
:
{
tooltip
,
tooltip
,
...
@@ -15,7 +20,7 @@ export default {
...
@@ -15,7 +20,7 @@ export default {
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
validator
(
value
)
{
validator
(
value
)
{
return
[
'
up
'
,
'
down
'
]
.
includes
(
value
);
return
Object
.
keys
(
directions
)
.
includes
(
value
);
},
},
},
},
disabled
:
{
disabled
:
{
...
@@ -25,7 +30,7 @@ export default {
...
@@ -25,7 +30,7 @@ export default {
},
},
computed
:
{
computed
:
{
tooltipTitle
()
{
tooltipTitle
()
{
return
this
.
direction
===
'
up
'
?
__
(
'
Scroll to top
'
)
:
__
(
'
Scroll to bottom
'
);
return
this
.
direction
===
directions
.
up
?
__
(
'
Scroll to top
'
)
:
__
(
'
Scroll to bottom
'
);
},
},
iconName
()
{
iconName
()
{
return
`scroll_
${
this
.
direction
}
`
;
return
`scroll_
${
this
.
direction
}
`
;
...
...
app/assets/javascripts/ide/components/jobs/item.vue
View file @
d2dcfe5f
...
@@ -32,6 +32,7 @@ export default {
...
@@ -32,6 +32,7 @@ export default {
/>
/>
<div
class=
"ml-auto align-self-center"
>
<div
class=
"ml-auto align-self-center"
>
<button
<button
type=
"button"
class=
"btn btn-default btn-sm"
class=
"btn btn-default btn-sm"
@
click=
"clickViewLog"
@
click=
"clickViewLog"
>
>
...
...
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