summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-04-26 14:34:19 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-06-03 17:10:20 -0500
commit6974d970b40af6b01e14941314a09d250d87c8d3 (patch)
tree252562f6ff9dfddf06a1cf2c5692e415b589029f /app
parent4ab6bfcef50b5e3a8c879ad06161bbc8b56bfb9a (diff)
downloadgitlab-ce-6974d970b40af6b01e14941314a09d250d87c8d3.tar.gz
typo
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/gl_dropdown.js.coffee8
-rw-r--r--app/assets/javascripts/labels_select.js.coffee19
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss4
3 files changed, 13 insertions, 18 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 7a23a3cf881..989ab3023ca 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -11,7 +11,7 @@ class GitLabDropdownFilter
$inputContainer = @input.parent()
$clearButton = $inputContainer.find('.js-dropdown-input-clear')
- @indeterminatedIds = []
+ @indeterminateIds = []
# Clear click
$clearButton.on 'click', (e) =>
@@ -300,10 +300,10 @@ class GitLabDropdown
opened: =>
@addArrowKeyEvent()
- if @options.setIndeterminatedIds
- @options.setIndeterminatedIds.call(@)
+ if @options.setIndeterminateIds
+ @options.setIndeterminateIds.call(@)
- # Makes indeterminated items effective
+ # Makes indeterminate items effective
if @fullData and @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
@parseData @fullData
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 0aedc7a5f0b..da2c85967df 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -203,20 +203,15 @@ class @LabelsSelect
removesAll = label.id is 0 or not label.id?
if $dropdown.hasClass('js-filter-bulk-update')
- indeterminated = instance.indeterminatedIds
- if indeterminated.indexOf(label.id) isnt -1
- selectedClass.push 'indeterminated'
+ indeterminate = instance.indeterminateIds
+ if indeterminate.indexOf(label.id) isnt -1
+ selectedClass.push 'indeterminate'
if $form.find("input[type='hidden']\
[name='#{$dropdown.data('fieldName')}']\
[value='#{this.id(label)}']").length
selectedClass.push 'is-active'
- index = selectedClass.indexOf('indeterminated')
-
- if index isnt -1
- selectedClass.splice(index, 1)
-
if $dropdown.hasClass('js-multiselect') and removesAll
selectedClass.push 'dropdown-clear-active'
@@ -316,13 +311,13 @@ class @LabelsSelect
else
saveLabelData()
- setIndeterminatedIds: ->
+ setIndeterminateIds: ->
if @dropdown.find('.dropdown-menu-toggle').hasClass('js-filter-bulk-update')
- console.log 'options.setIndeterminatedIds'
- @indeterminatedIds = _this.getIndeterminatedIds()
+ console.log 'options.setIndeterminateIds'
+ @indeterminateIds = _this.getIndeterminateIds()
)
- getIndeterminatedIds: ->
+ getIndeterminateIds: ->
label_ids = []
$('.selected_issue:checked').each (i, el) ->
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index a77c19bf2a7..6ef0405c7e7 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -232,7 +232,7 @@
a {
padding-left: 25px;
- &.indeterminated, &.is-active{
+ &.indeterminate, &.is-active{
&::before {
position: absolute;
left: 5px;
@@ -246,7 +246,7 @@
}
}
- &.indeterminated::before {
+ &.indeterminate::before {
content: "\f068";
}