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
cb619298
Commit
cb619298
authored
8 years ago
by
Jacob Schatz
Committed by
Jacob Schatz
8 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make changed values visible in minimized sidebar.
parent
7b2af874
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
25 deletions
+39
-25
app/assets/javascripts/labels_select.js.coffee
app/assets/javascripts/labels_select.js.coffee
+13
-7
app/assets/javascripts/milestone_select.js.coffee
app/assets/javascripts/milestone_select.js.coffee
+9
-13
app/assets/javascripts/users_select.js.coffee
app/assets/javascripts/users_select.js.coffee
+17
-5
No files found.
app/assets/javascripts/labels_select.js.coffee
View file @
cb619298
...
...
@@ -16,6 +16,7 @@ class @LabelsSelect
abilityName
=
$dropdown
.
data
(
'ability-name'
)
$selectbox
=
$dropdown
.
closest
(
'.selectbox'
)
$block
=
$selectbox
.
closest
(
'.block'
)
$sidebarCollapsedValue
=
$block
.
find
(
'.sidebar-collapsed-icon span'
)
$value
=
$block
.
find
(
'.value'
)
$loading
=
$block
.
find
(
'.block-loading'
).
fadeOut
()
...
...
@@ -151,13 +152,17 @@ class @LabelsSelect
$loading
.
fadeOut
()
$selectbox
.
hide
()
data
.
issueURLSplit
=
issueURLSplit
if
not
data
.
labels
.
length
template
=
labelNoneHTMLTemplate
()
else
labelCount
=
0
if
data
.
labels
.
length
template
=
labelHTMLTemplate
(
data
)
href
=
$value
.
show
()
labelCount
=
data
.
labels
.
length
else
template
=
labelNoneHTMLTemplate
()
$value
.
removeAttr
(
'style'
)
.
html
(
template
)
$sidebarCollapsedValue
.
text
(
labelCount
)
$value
.
find
(
'a'
)
.
each
((
i
)
->
...
...
@@ -226,7 +231,8 @@ class @LabelsSelect
hidden
:
->
$selectbox
.
hide
()
$value
.
show
()
# display:block overrides the hide-collapse rule
$value
.
removeAttr
(
'style'
)
if
$dropdown
.
hasClass
'js-multiselect'
saveLabelData
()
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/milestone_select.js.coffee
View file @
cb619298
...
...
@@ -18,6 +18,7 @@ class @MilestoneSelect
abilityName
=
$dropdown
.
data
(
'ability-name'
)
$selectbox
=
$dropdown
.
closest
(
'.selectbox'
)
$block
=
$selectbox
.
closest
(
'.block'
)
$sidebarCollapsedValue
=
$block
.
find
(
'.sidebar-collapsed-icon span'
)
$value
=
$block
.
find
(
'.value'
)
$loading
=
$block
.
find
(
'.block-loading'
).
fadeOut
()
...
...
@@ -80,18 +81,14 @@ class @MilestoneSelect
milestone
.
name
is
selectedMilestone
hidden
:
->
$selectbox
.
hide
()
$value
.
show
()
clicked
:
(
selected
)
->
# display:block overrides the hide-collapse rule
$value
.
removeAttr
(
'style'
)
clicked
:
(
e
)
->
if
$dropdown
.
hasClass
'js-filter-bulk-update'
return
if
$dropdown
.
hasClass
(
'js-filter-submit'
)
if
selected
.
name
?
selectedMilestone
=
selected
.
name
else
if
selected
.
title
?
selectedMilestone
=
selected
.
title
else
selectedMilestone
=
''
if
$dropdown
.
hasClass
'js-filter-submit'
$dropdown
.
parents
(
'form'
).
submit
()
else
selected
=
$selectbox
...
...
@@ -109,13 +106,12 @@ class @MilestoneSelect
).
done
(
data
)
->
$loading
.
fadeOut
()
$selectbox
.
hide
()
$milestoneLink
=
$value
.
show
()
.
find
(
'a'
)
$value
.
removeAttr
(
'style'
)
if
data
.
milestone
?
data
.
milestone
.
namespace
=
_this
.
currentProject
.
namespace
data
.
milestone
.
path
=
_this
.
currentProject
.
path
$value
.
html
(
milestoneLinkTemplate
(
data
.
milestone
))
$sidebarCollapsedValue
.
text
(
data
.
milestone
.
title
)
else
$value
.
html
(
milestoneLinkNoneTemplate
)
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app/assets/javascripts/users_select.js.coffee
View file @
cb619298
...
...
@@ -19,6 +19,7 @@ class @UsersSelect
$block
=
$selectbox
.
closest
(
'.block'
)
abilityName
=
$dropdown
.
data
(
'ability-name'
)
$value
=
$block
.
find
(
'.value'
)
$collapsedSidebar
=
$block
.
find
(
'.sidebar-collapsed-user'
)
$loading
=
$block
.
find
(
'.block-loading'
).
fadeOut
()
$block
.
on
(
'click'
,
'.js-assign-yourself'
,
(
e
)
=>
...
...
@@ -51,11 +52,21 @@ class @UsersSelect
name
:
'Unassigned'
username
:
''
avatar
:
''
$value
.
html
(
assigneeTemplate
(
user
))
$collapsedSidebar
.
html
(
collapsedAssigneeTemplate
(
user
))
collapsedAssigneeTemplate
=
_
.
template
(
'<% if( avatar ) { %>
<a class="author_link" href="/u/<%= username %>">
<img width="24" class="avatar avatar-inline s24" alt="" src="<%= avatar %>">
<span class="author">Toni Boehm</span>
</a>
<% } else { %>
<i class="fa fa-user"></i>
<% } %>'
)
$value
.
html
(
noAssigneeTemplate
(
user
))
$value
.
find
(
'a'
).
attr
(
'href'
)
noAssigneeTemplate
=
_
.
template
(
assigneeTemplate
=
_
.
template
(
'<% if (username) { %>
<a class="author_link " href="/u/<%= username %>">
<% if( avatar ) { %>
...
...
@@ -131,7 +142,8 @@ class @UsersSelect
hidden
:
(
e
)
->
$selectbox
.
hide
()
$value
.
show
()
# display:block overrides the hide-collapse rule
$value
.
removeAttr
(
'style'
)
clicked
:
(
user
)
->
page
=
$
(
'body'
).
data
'page'
...
...
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