kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

typo

Browse source
This commit is contained in:
Alfredo Sumaran 2016-04-26 14:34:19 -05:00
parent 4ab6bfcef5
commit 6974d970b4
3 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/gl_dropdown.js.coffee
View file

@ -11,7 +11,7 @@ class GitLabDropdownFilter
$inputContainer = @input.parent() $inputContainer = @input.parent()
$clearButton = $inputContainer.find('.js-dropdown-input-clear') $clearButton = $inputContainer.find('.js-dropdown-input-clear')
@indeterminatedIds = [] @indeterminateIds = []
# Clear click # Clear click
$clearButton.on 'click', (e) => $clearButton.on 'click', (e) =>
@ -300,10 +300,10 @@ class GitLabDropdown
opened: => opened: =>
@addArrowKeyEvent() @addArrowKeyEvent()
if @options.setIndeterminatedIds if @options.setIndeterminateIds
@options.setIndeterminatedIds.call(@) @options.setIndeterminateIds.call(@)
# Makes indeterminated items effective # Makes indeterminate items effective
if @fullData and @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update') if @fullData and @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
@parseData @fullData @parseData @fullData

19
app/assets/javascripts/labels_select.js.coffee
View file

@ -203,20 +203,15 @@ class @LabelsSelect
removesAll = label.id is 0 or not label.id? removesAll = label.id is 0 or not label.id?
if $dropdown.hasClass('js-filter-bulk-update') if $dropdown.hasClass('js-filter-bulk-update')
indeterminated = instance.indeterminatedIds indeterminate = instance.indeterminateIds
if indeterminated.indexOf(label.id) isnt -1 if indeterminate.indexOf(label.id) isnt -1
selectedClass.push 'indeterminated' selectedClass.push 'indeterminate'
if $form.find("input[type='hidden']\ if $form.find("input[type='hidden']\
[name='#{$dropdown.data('fieldName')}']\ [name='#{$dropdown.data('fieldName')}']\
[value='#{this.id(label)}']").length [value='#{this.id(label)}']").length
selectedClass.push 'is-active' selectedClass.push 'is-active'
index = selectedClass.indexOf('indeterminated')
if index isnt -1
selectedClass.splice(index, 1)
if $dropdown.hasClass('js-multiselect') and removesAll if $dropdown.hasClass('js-multiselect') and removesAll
selectedClass.push 'dropdown-clear-active' selectedClass.push 'dropdown-clear-active'
@ -316,13 +311,13 @@ class @LabelsSelect
else else
saveLabelData() saveLabelData()
setIndeterminatedIds: -> setIndeterminateIds: ->
if @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update') if @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
console.log 'options.setIndeterminatedIds' console.log 'options.setIndeterminateIds'
@indeterminatedIds = _this.getIndeterminatedIds() @indeterminateIds = _this.getIndeterminateIds()
) )
getIndeterminatedIds: -> getIndeterminateIds: ->
label_ids = [] label_ids = []
$('.selected_issue:checked').each (i, el) -> $('.selected_issue:checked').each (i, el) ->

4
app/assets/stylesheets/framework/dropdowns.scss
View file

@ -232,7 +232,7 @@
a { a {
padding-left: 25px; padding-left: 25px;
&.indeterminated, &.is-active{ &.indeterminate, &.is-active{
&::before { &::before {
position: absolute; position: absolute;
left: 5px; left: 5px;
@ -246,7 +246,7 @@
} }
} }
&.indeterminated::before { &.indeterminate::before {
content: "\f068"; content: "\f068";
} }