BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
d8aaf018
Commit
d8aaf018
authored
Apr 26, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle unchecking of indeterminate items
parent
eccc1f59
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
11 deletions
+30
-11
gl_dropdown.js.coffee
app/assets/javascripts/gl_dropdown.js.coffee
+24
-8
labels_select.js.coffee
app/assets/javascripts/labels_select.js.coffee
+6
-3
No files found.
app/assets/javascripts/gl_dropdown.js.coffee
View file @
d8aaf018
...
...
@@ -144,6 +144,7 @@ class GitLabDropdown
LOADING_CLASS
=
"is-loading"
PAGE_TWO_CLASS
=
"is-page-two"
ACTIVE_CLASS
=
"is-active"
INDETERMINATE_CLASS
=
"is-indeterminate"
currentIndex
=
-
1
FILTER_INPUT
=
'.dropdown-input .dropdown-input-field'
...
...
@@ -319,8 +320,6 @@ class GitLabDropdown
hidden
:
(
e
)
=>
@
removeArrayKeyEvent
()
return
if
@
dropdown
.
find
(
'.dropdown-menu-toggle'
).
hasClass
(
'js-filter-bulk-update'
)
if
@
options
.
filterable
@
dropdown
.
find
(
".dropdown-input-field"
)
...
...
@@ -455,6 +454,17 @@ class GitLabDropdown
$
(
@
el
).
find
(
".dropdown-toggle-text"
).
text
@
options
.
toggleLabel
else
selectedObject
else
if
el
.
hasClass
(
INDETERMINATE_CLASS
)
el
.
addClass
ACTIVE_CLASS
el
.
removeClass
INDETERMINATE_CLASS
if
!
value
?
field
.
remove
()
if
!
field
.
length
and
fieldName
@
addInput
(
fieldName
,
value
)
return
selectedObject
else
if
not
@
options
.
multiSelect
or
el
.
hasClass
(
'dropdown-clear-active'
)
@
dropdown
.
find
(
".
#{
ACTIVE_CLASS
}
"
).
removeClass
ACTIVE_CLASS
...
...
@@ -471,17 +481,23 @@ class GitLabDropdown
$
(
@
el
).
find
(
".dropdown-toggle-text"
).
text
@
options
.
toggleLabel
(
selectedObject
,
el
)
if
value
?
if
!
field
.
length
and
fieldName
# Create hidden input for form
input
=
"<input type='hidden' name='
#{
fieldName
}
' value='
#{
value
}
' />"
if
@
options
.
inputId
?
input
=
$
(
input
)
.
attr
(
'id'
,
@
options
.
inputId
)
@
dropdown
.
before
input
@
addInput
(
fieldName
,
value
)
else
field
.
val
value
return
selectedObject
addInput
:
(
fieldName
,
value
)
->
# Create hidden input for form
input
=
"<input type='hidden' name='
#{
fieldName
}
' value='
#{
value
}
' />"
if
@
options
.
inputId
?
input
=
$
(
input
)
.
attr
(
'id'
,
@
options
.
inputId
)
@
dropdown
.
before
input
removeInputs
:
->
@
dropdown
.
parent
().
find
(
'input[type="hidden"]'
).
remove
()
selectRowAtIndex
:
(
e
,
index
)
->
selector
=
".dropdown-content li:not(.divider,.dropdown-header,.separator):eq(
#{
index
}
) a"
...
...
app/assets/javascripts/labels_select.js.coffee
View file @
d8aaf018
...
...
@@ -271,8 +271,6 @@ class @LabelsSelect
label
.
id
hidden
:
->
return
if
$dropdown
.
hasClass
(
'js-filter-bulk-update'
)
page
=
$
(
'body'
).
data
'page'
isIssueIndex
=
page
is
'projects:issues:index'
isMRIndex
=
page
is
'projects:merge_requests:index'
...
...
@@ -289,7 +287,12 @@ class @LabelsSelect
else
if
$dropdown
.
hasClass
(
'js-filter-submit'
)
$dropdown
.
closest
(
'form'
).
submit
()
else
saveLabelData
()
if
not
$dropdown
.
hasClass
'js-filter-bulk-update'
saveLabelData
()
if
$dropdown
.
hasClass
(
'js-filter-bulk-update'
)
@
removeInputs
()
$dropdown
.
parent
().
find
(
'.is-active, .is-indeterminate'
).
removeClass
()
multiSelect
:
$dropdown
.
hasClass
'js-multiselect'
clicked
:
(
label
)
->
...
...
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