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
8752b99f
Commit
8752b99f
authored
7 years ago
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only destroy the component's tooltip
parent
4038d50d
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
10 deletions
+14
-10
app/assets/javascripts/environments/components/environment_actions.js
...avascripts/environments/components/environment_actions.js
+1
-1
app/assets/javascripts/environments/components/environment_rollback.js
...vascripts/environments/components/environment_rollback.js
+1
-1
app/assets/javascripts/environments/components/environment_stop.js
...s/javascripts/environments/components/environment_stop.js
+1
-1
app/assets/javascripts/vue_pipelines_index/components/async_button.vue
...vascripts/vue_pipelines_index/components/async_button.vue
+10
-6
app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js
...ripts/vue_pipelines_index/components/pipelines_actions.js
+1
-1
No files found.
app/assets/javascripts/environments/components/environment_actions.js
View file @
8752b99f
...
@@ -35,7 +35,7 @@ export default {
...
@@ -35,7 +35,7 @@ export default {
onClickAction
(
endpoint
)
{
onClickAction
(
endpoint
)
{
this
.
isLoading
=
true
;
this
.
isLoading
=
true
;
$
(
'
.has-tooltip
'
).
tooltip
(
'
destroy
'
);
$
(
this
.
$el
.
querySelector
(
'
.has-tooltip
'
)
).
tooltip
(
'
destroy
'
);
this
.
service
.
postAction
(
endpoint
)
this
.
service
.
postAction
(
endpoint
)
.
then
(()
=>
{
.
then
(()
=>
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/environments/components/environment_rollback.js
View file @
8752b99f
...
@@ -36,7 +36,7 @@ export default {
...
@@ -36,7 +36,7 @@ export default {
onClick
()
{
onClick
()
{
this
.
isLoading
=
true
;
this
.
isLoading
=
true
;
$
(
'
.has-tooltip
'
).
tooltip
(
'
destroy
'
);
$
(
this
.
$el
).
tooltip
(
'
destroy
'
);
this
.
service
.
postAction
(
this
.
retryUrl
)
this
.
service
.
postAction
(
this
.
retryUrl
)
.
then
(()
=>
{
.
then
(()
=>
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/environments/components/environment_stop.js
View file @
8752b99f
...
@@ -36,7 +36,7 @@ export default {
...
@@ -36,7 +36,7 @@ export default {
if
(
confirm
(
'
Are you sure you want to stop this environment?
'
))
{
if
(
confirm
(
'
Are you sure you want to stop this environment?
'
))
{
this
.
isLoading
=
true
;
this
.
isLoading
=
true
;
$
(
'
.has-tooltip
'
).
tooltip
(
'
destroy
'
);
$
(
this
.
$el
).
tooltip
(
'
destroy
'
);
this
.
service
.
postAction
(
this
.
retryUrl
)
this
.
service
.
postAction
(
this
.
retryUrl
)
.
then
(()
=>
{
.
then
(()
=>
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/vue_pipelines_index/components/async_button.vue
View file @
8752b99f
...
@@ -54,7 +54,7 @@ export default {
...
@@ -54,7 +54,7 @@ export default {
},
},
methods
:
{
methods
:
{
onClick
()
{
onClick
(
e
)
{
if
(
this
.
confirmActionMessage
&&
confirm
(
this
.
confirmActionMessage
))
{
if
(
this
.
confirmActionMessage
&&
confirm
(
this
.
confirmActionMessage
))
{
this
.
makeRequest
();
this
.
makeRequest
();
}
else
if
(
!
this
.
confirmActionMessage
)
{
}
else
if
(
!
this
.
confirmActionMessage
)
{
...
@@ -65,7 +65,7 @@ export default {
...
@@ -65,7 +65,7 @@ export default {
makeRequest
()
{
makeRequest
()
{
this
.
isLoading
=
true
;
this
.
isLoading
=
true
;
$
(
'
.has-tooltip
'
).
tooltip
(
'
destroy
'
);
$
(
this
.
$el
).
tooltip
(
'
destroy
'
);
this
.
service
.
postAction
(
this
.
endpoint
)
this
.
service
.
postAction
(
this
.
endpoint
)
.
then
(()
=>
{
.
then
(()
=>
{
...
@@ -90,9 +90,13 @@ export default {
...
@@ -90,9 +90,13 @@ export default {
:aria-label=
"title"
:aria-label=
"title"
data-container=
"body"
data-container=
"body"
data-placement=
"top"
data-placement=
"top"
:disabled=
"isLoading"
:disabled=
"isLoading"
>
>
<i
<i
:class=
"iconClass"
aria-hidden=
"true"
></i>
:class=
"iconClass"
<i
class=
"fa fa-spinner fa-spin"
aria-hidden=
"true"
v-if=
"isLoading"
></i>
aria-hidden=
"true"
/>
<i
class=
"fa fa-spinner fa-spin"
aria-hidden=
"true"
v-if=
"isLoading"
/>
</button>
</button>
</
template
>
</
template
>
This diff is collapsed.
Click to expand it.
app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js
View file @
8752b99f
...
@@ -28,7 +28,7 @@ export default {
...
@@ -28,7 +28,7 @@ export default {
onClickAction
(
endpoint
)
{
onClickAction
(
endpoint
)
{
this
.
isLoading
=
true
;
this
.
isLoading
=
true
;
$
(
'
.has-tooltip
'
).
tooltip
(
'
destroy
'
);
$
(
this
.
$el
.
querySelector
(
'
.has-tooltip
'
)
).
tooltip
(
'
destroy
'
);
this
.
service
.
postAction
(
endpoint
)
this
.
service
.
postAction
(
endpoint
)
.
then
(()
=>
{
.
then
(()
=>
{
...
...
This diff is collapsed.
Click to expand it.
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