BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
99d0a615
Commit
99d0a615
authored
Apr 19, 2017
by
Phil Hughes
Committed by
Lin Jen-Shin
Apr 20, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch '30985-cancel-pipelines' into 'master'
Destroy tooltip in async buttons and dropdowns Closes #30985 See merge request !10768
parent
83375c5e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
0 deletions
+12
-0
environment_actions.js
...avascripts/environments/components/environment_actions.js
+3
-0
environment_rollback.js
...vascripts/environments/components/environment_rollback.js
+2
-0
environment_stop.js
...s/javascripts/environments/components/environment_stop.js
+2
-0
async_button.js
...avascripts/vue_pipelines_index/components/async_button.js
+2
-0
pipelines_actions.js
...ripts/vue_pipelines_index/components/pipelines_actions.js
+3
-0
No files found.
app/assets/javascripts/environments/components/environment_actions.js
View file @
99d0a615
...
...
@@ -35,6 +35,8 @@ export default {
onClickAction
(
endpoint
)
{
this
.
isLoading
=
true
;
$
(
this
.
$refs
.
tooltip
).
tooltip
(
'destroy'
);
this
.
service
.
postAction
(
endpoint
)
.
then
(()
=>
{
this
.
isLoading
=
false
;
...
...
@@ -62,6 +64,7 @@ export default {
class="dropdown btn btn-default dropdown-new js-dropdown-play-icon-container has-tooltip"
data-container="body"
data-toggle="dropdown"
ref="tooltip"
:title="title"
:aria-label="title"
:disabled="isLoading">
...
...
app/assets/javascripts/environments/components/environment_rollback.js
View file @
99d0a615
...
...
@@ -36,6 +36,8 @@ export default {
onClick
()
{
this
.
isLoading
=
true
;
$
(
this
.
$el
).
tooltip
(
'destroy'
);
this
.
service
.
postAction
(
this
.
retryUrl
)
.
then
(()
=>
{
this
.
isLoading
=
false
;
...
...
app/assets/javascripts/environments/components/environment_stop.js
View file @
99d0a615
...
...
@@ -36,6 +36,8 @@ export default {
if
(
confirm
(
'Are you sure you want to stop this environment?'
))
{
this
.
isLoading
=
true
;
$
(
this
.
$el
).
tooltip
(
'destroy'
);
this
.
service
.
postAction
(
this
.
retryUrl
)
.
then
(()
=>
{
this
.
isLoading
=
false
;
...
...
app/assets/javascripts/vue_pipelines_index/components/async_button.js
View file @
99d0a615
...
...
@@ -64,6 +64,8 @@ export default {
makeRequest
()
{
this
.
isLoading
=
true
;
$
(
this
.
$el
).
tooltip
(
'destroy'
);
this
.
service
.
postAction
(
this
.
endpoint
)
.
then
(()
=>
{
this
.
isLoading
=
false
;
...
...
app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js
View file @
99d0a615
...
...
@@ -28,6 +28,8 @@ export default {
onClickAction
(
endpoint
)
{
this
.
isLoading
=
true
;
$
(
this
.
$refs
.
tooltip
).
tooltip
(
'destroy'
);
this
.
service
.
postAction
(
endpoint
)
.
then
(()
=>
{
this
.
isLoading
=
false
;
...
...
@@ -57,6 +59,7 @@ export default {
data-toggle="dropdown"
data-placement="top"
aria-label="Manual job"
ref="tooltip"
:disabled="isLoading">
${
playIconSvg
}
<i
...
...
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