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
a2cb73b8
Commit
a2cb73b8
authored
Aug 10, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use single js- wrapper class to show/hide
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146360
parent
d15b5c7f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
8 deletions
+10
-8
repo_edit_button.vue
app/assets/javascripts/repo/components/repo_edit_button.vue
+2
-4
index.js
app/assets/javascripts/repo/index.js
+1
-2
tree.scss
app/assets/stylesheets/pages/tree.scss
+4
-0
_tree_header.html.haml
app/views/projects/tree/_tree_header.html.haml
+3
-2
No files found.
app/assets/javascripts/repo/components/repo_edit_button.vue
View file @
a2cb73b8
...
...
@@ -29,12 +29,10 @@ export default {
editMode
()
{
if
(
this
.
editMode
)
{
$
(
'.project-refs-form'
).
addClass
(
'disabled'
);
$
(
'.fa-long-arrow-right'
).
show
();
$
(
'.project-refs-target-form'
).
show
();
$
(
'.js-tree-ref-target-holder'
).
show
();
}
else
{
$
(
'.project-refs-form'
).
removeClass
(
'disabled'
);
$
(
'.fa-long-arrow-right'
).
hide
();
$
(
'.project-refs-target-form'
).
hide
();
$
(
'.js-tree-ref-target-holder'
).
hide
();
}
},
},
...
...
app/assets/javascripts/repo/index.js
View file @
a2cb73b8
...
...
@@ -7,8 +7,7 @@ import RepoEditButton from './components/repo_edit_button.vue';
import
Translate
from
'../vue_shared/translate'
;
function
initDropdowns
()
{
$
(
'.project-refs-target-form'
).
hide
();
$
(
'.fa-long-arrow-right'
).
hide
();
$
(
'.js-tree-ref-target-holder'
).
hide
();
}
function
addEventsForNonVueEls
()
{
...
...
app/assets/stylesheets/pages/tree.scss
View file @
a2cb73b8
...
...
@@ -29,6 +29,10 @@
margin-right
:
15px
;
}
.tree-ref-target-holder
{
display
:
inline-block
;
}
.repo-breadcrumb
{
li
:last-of-type
{
position
:
relative
;
...
...
app/views/projects/tree/_tree_header.html.haml
View file @
a2cb73b8
...
...
@@ -2,8 +2,9 @@
.tree-ref-holder
=
render
'shared/ref_switcher'
,
destination:
'tree'
,
path:
@path
-
if
show_new_repo?
=
icon
(
'long-arrow-right'
,
title:
'to target branch'
)
=
render
'shared/target_switcher'
,
destination:
'tree'
,
path:
@path
.tree-ref-target-holder.js-tree-ref-target-holder
=
icon
(
'long-arrow-right'
,
title:
'to target branch'
)
=
render
'shared/target_switcher'
,
destination:
'tree'
,
path:
@path
-
unless
show_new_repo?
=
render
'projects/tree/old_tree_header'
...
...
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