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
6974d970
Commit
6974d970
authored
Apr 26, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
typo
parent
4ab6bfce
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
18 deletions
+13
-18
app/assets/javascripts/gl_dropdown.js.coffee
app/assets/javascripts/gl_dropdown.js.coffee
+4
-4
app/assets/javascripts/labels_select.js.coffee
app/assets/javascripts/labels_select.js.coffee
+7
-12
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+2
-2
No files found.
app/assets/javascripts/gl_dropdown.js.coffee
View file @
6974d970
...
@@ -11,7 +11,7 @@ class GitLabDropdownFilter
...
@@ -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'
)
@
indeterminate
d
Ids
=
[]
@
indeterminateIds
=
[]
# Clear click
# Clear click
$clearButton
.
on
'click'
,
(
e
)
=>
$clearButton
.
on
'click'
,
(
e
)
=>
...
@@ -300,10 +300,10 @@ class GitLabDropdown
...
@@ -300,10 +300,10 @@ class GitLabDropdown
opened
:
=>
opened
:
=>
@
addArrowKeyEvent
()
@
addArrowKeyEvent
()
if
@
options
.
setIndeterminate
d
Ids
if
@
options
.
setIndeterminateIds
@
options
.
setIndeterminate
d
Ids
.
call
(
@
)
@
options
.
setIndeterminateIds
.
call
(
@
)
# Makes indeterminate
d
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
...
...
app/assets/javascripts/labels_select.js.coffee
View file @
6974d970
...
@@ -203,20 +203,15 @@ class @LabelsSelect
...
@@ -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'
)
indeterminate
d
=
instance
.
indeterminated
Ids
indeterminate
=
instance
.
indeterminate
Ids
if
indeterminate
d
.
indexOf
(
label
.
id
)
isnt
-
1
if
indeterminate
.
indexOf
(
label
.
id
)
isnt
-
1
selectedClass
.
push
'indeterminate
d
'
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
...
@@ -316,13 +311,13 @@ class @LabelsSelect
else
else
saveLabelData
()
saveLabelData
()
setIndeterminate
d
Ids
:
->
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.setIndeterminate
d
Ids'
console
.
log
'options.setIndeterminateIds'
@
indeterminate
dIds
=
_this
.
getIndeterminated
Ids
()
@
indeterminate
Ids
=
_this
.
getIndeterminate
Ids
()
)
)
getIndeterminate
d
Ids
:
->
getIndeterminateIds
:
->
label_ids
=
[]
label_ids
=
[]
$
(
'.selected_issue:checked'
).
each
(
i
,
el
)
->
$
(
'.selected_issue:checked'
).
each
(
i
,
el
)
->
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
6974d970
...
@@ -232,7 +232,7 @@
...
@@ -232,7 +232,7 @@
a
{
a
{
padding-left
:
25px
;
padding-left
:
25px
;
&
.indeterminate
d
,
&
.is-active
{
&
.indeterminate
,
&
.is-active
{
&
:
:
before
{
&
:
:
before
{
position
:
absolute
;
position
:
absolute
;
left
:
5px
;
left
:
5px
;
...
@@ -246,7 +246,7 @@
...
@@ -246,7 +246,7 @@
}
}
}
}
&.
indeterminate
d
:
:
before
{
&.
indeterminate
:
:
before
{
content
:
"\f068"
;
content
:
"\f068"
;
}
}
...
...
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