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
f8705d4f
Commit
f8705d4f
authored
Apr 19, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace tooltip('destroy') with tooltip('dispose')
parent
cefeeaea
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
app/assets/javascripts/awards_handler.js
app/assets/javascripts/awards_handler.js
+2
-2
app/assets/javascripts/boards/index.js
app/assets/javascripts/boards/index.js
+1
-1
app/assets/javascripts/environments/components/environment_stop.vue
.../javascripts/environments/components/environment_stop.vue
+1
-1
app/assets/javascripts/label_manager.js
app/assets/javascripts/label_manager.js
+1
-1
app/assets/javascripts/main.js
app/assets/javascripts/main.js
+2
-2
app/assets/javascripts/vue_shared/directives/tooltip.js
app/assets/javascripts/vue_shared/directives/tooltip.js
+1
-1
No files found.
app/assets/javascripts/awards_handler.js
View file @
f8705d4f
...
...
@@ -345,7 +345,7 @@ class AwardsHandler {
counter
.
text
(
counterNumber
-
1
);
this
.
removeYouFromUserList
(
$emojiButton
);
}
else
if
(
emoji
===
'
thumbsup
'
||
emoji
===
'
thumbsdown
'
)
{
$emojiButton
.
tooltip
(
'
d
estroy
'
);
$emojiButton
.
tooltip
(
'
d
ispose
'
);
counter
.
text
(
'
0
'
);
this
.
removeYouFromUserList
(
$emojiButton
);
if
(
$emojiButton
.
parents
(
'
.note
'
).
length
)
{
...
...
@@ -358,7 +358,7 @@ class AwardsHandler {
}
removeEmoji
(
$emojiButton
)
{
$emojiButton
.
tooltip
(
'
d
estroy
'
);
$emojiButton
.
tooltip
(
'
d
ispose
'
);
$emojiButton
.
remove
();
const
$votesBlock
=
this
.
getVotesBlock
();
if
(
$votesBlock
.
find
(
'
.js-emoji-btn
'
).
length
===
0
)
{
...
...
app/assets/javascripts/boards/index.js
View file @
f8705d4f
...
...
@@ -214,7 +214,7 @@ export default () => {
if
(
this
.
disabled
)
{
$tooltip
.
tooltip
();
}
else
{
$tooltip
.
tooltip
(
'
d
estroy
'
);
$tooltip
.
tooltip
(
'
d
ispose
'
);
}
});
},
...
...
app/assets/javascripts/environments/components/environment_stop.vue
View file @
f8705d4f
...
...
@@ -43,7 +43,7 @@
if
(
confirm
(
'
Are you sure you want to stop this environment?
'
))
{
this
.
isLoading
=
true
;
$
(
this
.
$el
).
tooltip
(
'
d
estroy
'
);
$
(
this
.
$el
).
tooltip
(
'
d
ispose
'
);
eventHub
.
$emit
(
'
postAction
'
,
this
.
stopUrl
);
}
...
...
app/assets/javascripts/label_manager.js
View file @
f8705d4f
...
...
@@ -35,7 +35,7 @@ export default class LabelManager {
const
$label
=
$
(
`#
${
$btn
.
data
(
'
domId
'
)}
`
);
const
action
=
$btn
.
parents
(
'
.js-prioritized-labels
'
).
length
?
'
remove
'
:
'
add
'
;
const
$tooltip
=
$
(
`#
${
$btn
.
find
(
'
.has-tooltip:visible
'
).
attr
(
'
aria-describedby
'
)}
`
);
$tooltip
.
tooltip
(
'
d
estroy
'
);
$tooltip
.
tooltip
(
'
d
ispose
'
);
_this
.
toggleLabelPriority
(
$label
,
action
);
_this
.
toggleEmptyState
(
$label
,
$btn
,
action
);
}
...
...
app/assets/javascripts/main.js
View file @
f8705d4f
...
...
@@ -46,7 +46,7 @@ document.addEventListener('beforeunload', () => {
// Unbind scroll events
$
(
document
).
off
(
'
scroll
'
);
// Close any open tooltips
$
(
'
.has-tooltip, [data-toggle="tooltip"]
'
).
tooltip
(
'
d
estroy
'
);
$
(
'
.has-tooltip, [data-toggle="tooltip"]
'
).
tooltip
(
'
d
ispose
'
);
// Close any open popover
$
(
'
[data-toggle="popover"]
'
).
popover
(
'
destroy
'
);
});
...
...
@@ -108,7 +108,7 @@ document.addEventListener('DOMContentLoaded', () => {
addSelectOnFocusBehaviour
(
'
.js-select-on-focus
'
);
$
(
'
.remove-row
'
).
on
(
'
ajax:success
'
,
function
removeRowAjaxSuccessCallback
()
{
$
(
this
).
tooltip
(
'
d
estroy
'
)
$
(
this
).
tooltip
(
'
d
ispose
'
)
.
closest
(
'
li
'
)
.
fadeOut
();
});
...
...
app/assets/javascripts/vue_shared/directives/tooltip.js
View file @
f8705d4f
...
...
@@ -10,6 +10,6 @@ export default {
},
unbind
(
el
)
{
$
(
el
).
tooltip
(
'
d
estroy
'
);
$
(
el
).
tooltip
(
'
d
ispose
'
);
},
};
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