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
1a7ccd0f
Commit
1a7ccd0f
authored
Apr 20, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed animation from labels filter
parent
5cefd8ab
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
25 deletions
+9
-25
app/assets/javascripts/issues.js.coffee
app/assets/javascripts/issues.js.coffee
+7
-23
app/views/shared/_labels_row.html.haml
app/views/shared/_labels_row.html.haml
+1
-1
app/views/shared/issuable/_filter.html.haml
app/views/shared/issuable/_filter.html.haml
+1
-1
No files found.
app/assets/javascripts/issues.js.coffee
View file @
1a7ccd0f
...
@@ -29,11 +29,9 @@
...
@@ -29,11 +29,9 @@
toggleLabelFilters
:
()
->
toggleLabelFilters
:
()
->
$filteredLabels
=
$
(
'.filtered-labels'
)
$filteredLabels
=
$
(
'.filtered-labels'
)
if
$filteredLabels
.
find
(
'.label-row'
).
length
>
0
if
$filteredLabels
.
find
(
'.label-row'
).
length
>
0
#$filteredLabels.show()
$filteredLabels
.
removeClass
(
'hidden'
)
$filteredLabels
.
slideDown
().
css
({
'overflow'
:
'visible'
})
else
else
#$filteredLabels.hide()
$filteredLabels
.
addClass
(
'hidden'
)
$filteredLabels
.
slideUp
().
css
({
'overflow'
:
'visible'
})
reload
:
->
reload
:
->
Issues
.
initChecks
()
Issues
.
initChecks
()
...
@@ -96,25 +94,11 @@
...
@@ -96,25 +94,11 @@
Issues
.
reload
()
Issues
.
reload
()
Issues
.
updateStateFilters
()
Issues
.
updateStateFilters
()
$filteredLabels
=
$
(
'.filtered-labels'
)
$filteredLabels
=
$
(
'.filtered-labels'
)
$filteredLabelsSpans
=
$filteredLabels
.
find
(
'.label-row'
)
gl
.
animate
.
animateEach
(
if
typeof
Issue
.
labelRow
is
'function'
$filteredLabelsSpans
,
'fadeOutDown'
,
20
,
$filteredLabels
.
html
(
Issue
.
labelRow
(
data
))
cssStart
:
opacity
:
1
Issues
.
toggleLabelFilters
()
cssEnd
:
opacity
:
0
).
then
(
->
if
typeof
Issue
.
labelRow
is
'function'
$filteredLabels
.
html
(
Issue
.
labelRow
(
data
))
Issues
.
toggleLabelFilters
()
$spans
=
$filteredLabels
.
find
(
'.label-row'
)
$spans
.
css
(
'opacity'
,
0
)
return
gl
.
animate
.
animateEach
$spans
,
'fadeInUp'
,
20
,
cssStart
:
opacity
:
0
cssEnd
:
opacity
:
1
)
dataType
:
"json"
dataType
:
"json"
...
...
app/views/shared/_labels_row.html.haml
View file @
1a7ccd0f
-
labels
.
each
do
|
label
|
-
labels
.
each
do
|
label
|
%span
.label-row
%span
.label-row
=
link_to_label
(
label
,
tooltip:
false
)
=
link_to_label
(
label
,
tooltip:
false
)
\ No newline at end of file
app/views/shared/issuable/_filter.html.haml
View file @
1a7ccd0f
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
.filter-item.inline
.filter-item.inline
=
button_tag
"Update issues"
,
class:
"btn update_selected_issues btn-save"
=
button_tag
"Update issues"
,
class:
"btn update_selected_issues btn-save"
.gray-content-block.second-block.filtered-labels
.gray-content-block.second-block.filtered-labels
{
class:
(
"hidden"
if
!
@labels
)
}
-
if
@labels
-
if
@labels
=
render
"shared/labels_row"
,
labels:
@labels
=
render
"shared/labels_row"
,
labels:
@labels
...
...
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