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
c9e8c618
Commit
c9e8c618
authored
Jun 06, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed dropdown not re-showing the content
parent
34dae228
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
app/assets/javascripts/ide/components/ide_side_bar.vue
app/assets/javascripts/ide/components/ide_side_bar.vue
+6
-7
app/assets/javascripts/ide/components/merge_requests/item.vue
...assets/javascripts/ide/components/merge_requests/item.vue
+1
-1
No files found.
app/assets/javascripts/ide/components/ide_side_bar.vue
View file @
c9e8c618
...
@@ -72,11 +72,9 @@ export default {
...
@@ -72,11 +72,9 @@ export default {
});
});
},
},
loading
()
{
loading
()
{
if
(
!
this
.
loading
)
{
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
addDropdownListeners
();
this
.
addDropdownListeners
();
});
});
}
},
},
},
},
mounted
()
{
mounted
()
{
...
@@ -89,11 +87,12 @@ export default {
...
@@ -89,11 +87,12 @@ export default {
},
},
methods
:
{
methods
:
{
addDropdownListeners
()
{
addDropdownListeners
()
{
if
(
!
this
.
$refs
.
mergeRequestDropdown
)
return
;
$
(
this
.
$refs
.
mergeRequestDropdown
)
$
(
this
.
$refs
.
mergeRequestDropdown
)
.
on
(
'
show.bs.dropdown
'
,
()
=>
{
.
on
(
'
show.bs.dropdown
'
,
()
=>
{
this
.
toggleMergeRequestDropdown
();
this
.
toggleMergeRequestDropdown
();
})
}).
on
(
'
hide.bs.dropdown
'
,
()
=>
{
.
on
(
'
hide.bs.dropdown
'
,
()
=>
{
this
.
toggleMergeRequestDropdown
();
this
.
toggleMergeRequestDropdown
();
});
});
},
},
...
...
app/assets/javascripts/ide/components/merge_requests/item.vue
View file @
c9e8c618
...
@@ -42,7 +42,7 @@ export default {
...
@@ -42,7 +42,7 @@ export default {
<button
<button
type=
"button"
type=
"button"
class=
"btn-link d-flex align-items-center"
class=
"btn-link d-flex align-items-center"
@
click
.prevent.stop
=
"clickItem"
@
click=
"clickItem"
>
>
<span
class=
"d-flex append-right-default ide-merge-request-current-icon"
>
<span
class=
"d-flex append-right-default ide-merge-request-current-icon"
>
<icon
<icon
...
...
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