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
Jérome Perrin
gitlab-ce
Commits
bcd00c85
Commit
bcd00c85
authored
Dec 28, 2017
by
Constance Okoghenun
Committed by
Jacob Schatz
Dec 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Webpack Roadmap"
parent
eb400b5e
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
212 additions
and
221 deletions
+212
-221
app/assets/javascripts/boards/components/board_sidebar.js
app/assets/javascripts/boards/components/board_sidebar.js
+1
-1
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+1
-1
app/assets/javascripts/init_issuable_sidebar.js
app/assets/javascripts/init_issuable_sidebar.js
+2
-1
app/assets/javascripts/init_legacy_filters.js
app/assets/javascripts/init_legacy_filters.js
+1
-1
app/assets/javascripts/issuable_bulk_update_sidebar.js
app/assets/javascripts/issuable_bulk_update_sidebar.js
+1
-2
app/assets/javascripts/milestone_select.js
app/assets/javascripts/milestone_select.js
+206
-215
No files found.
app/assets/javascripts/boards/components/board_sidebar.js
View file @
bcd00c85
/* eslint-disable comma-dangle, space-before-function-paren, no-new */
/* global MilestoneSelect */
import
Vue
from
'
vue
'
;
import
Flash
from
'
../../flash
'
;
...
...
@@ -12,6 +11,7 @@ import './sidebar/remove_issue';
import
IssuableContext
from
'
../../issuable_context
'
;
import
LabelsSelect
from
'
../../labels_select
'
;
import
subscriptions
from
'
../../sidebar/components/subscriptions/subscriptions.vue
'
;
import
MilestoneSelect
from
'
../../milestone_select
'
;
const
Store
=
gl
.
issueBoards
.
BoardsStore
;
...
...
app/assets/javascripts/dispatcher.js
View file @
bcd00c85
...
...
@@ -5,7 +5,7 @@ import IssuableIndex from './issuable_index';
import
Milestone
from
'
./milestone
'
;
import
IssuableForm
from
'
./issuable_form
'
;
import
LabelsSelect
from
'
./labels_select
'
;
/* global MilestoneSelect */
import
MilestoneSelect
from
'
./milestone_select
'
;
import
NewBranchForm
from
'
./new_branch_form
'
;
import
NotificationsForm
from
'
./notifications_form
'
;
import
notificationsDropdown
from
'
./notifications_dropdown
'
;
...
...
app/assets/javascripts/init_issuable_sidebar.js
View file @
bcd00c85
/* eslint-disable no-new */
/* global MilestoneSelect */
import
MilestoneSelect
from
'
./milestone_select
'
;
import
LabelsSelect
from
'
./labels_select
'
;
import
IssuableContext
from
'
./issuable_context
'
;
import
Sidebar
from
'
./right_sidebar
'
;
...
...
app/assets/javascripts/init_legacy_filters.js
View file @
bcd00c85
/* eslint-disable no-new */
import
LabelsSelect
from
'
./labels_select
'
;
/* global MilestoneSelect */
import
subscriptionSelect
from
'
./subscription_select
'
;
import
UsersSelect
from
'
./users_select
'
;
import
issueStatusSelect
from
'
./issue_status_select
'
;
import
MilestoneSelect
from
'
./milestone_select
'
;
export
default
()
=>
{
new
UsersSelect
();
...
...
app/assets/javascripts/issuable_bulk_update_sidebar.js
View file @
bcd00c85
/* eslint-disable class-methods-use-this, no-new */
/* global MilestoneSelect */
import
IssuableBulkUpdateActions
from
'
./issuable_bulk_update_actions
'
;
import
'
./milestone_select
'
;
import
MilestoneSelect
from
'
./milestone_select
'
;
import
issueStatusSelect
from
'
./issue_status_select
'
;
import
subscriptionSelect
from
'
./subscription_select
'
;
import
LabelsSelect
from
'
./labels_select
'
;
...
...
app/assets/javascripts/milestone_select.js
View file @
bcd00c85
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-
var, no-
underscore-dangle, prefer-arrow-callback, max-len, one-var, one-var-declaration-per-line, no-unused-vars, object-shorthand, comma-dangle, no-else-return, no-self-compare, consistent-return, no-param-reassign, no-shadow */
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-underscore-dangle, prefer-arrow-callback, max-len, one-var, one-var-declaration-per-line, no-unused-vars, object-shorthand, comma-dangle, no-else-return, no-self-compare, consistent-return, no-param-reassign, no-shadow */
/* global Issuable */
/* global ListMilestone */
import
_
from
'
underscore
'
;
import
{
timeFor
}
from
'
./lib/utils/datetime_utility
'
;
(
function
()
{
this
.
MilestoneSelect
=
(
function
()
{
function
MilestoneSelect
(
currentProject
,
els
,
options
=
{})
{
var
_this
,
$els
;
if
(
currentProject
!=
null
)
{
_this
=
this
;
export
default
class
MilestoneSelect
{
constructor
(
currentProject
,
els
,
options
=
{})
{
if
(
currentProject
!==
null
)
{
this
.
currentProject
=
typeof
currentProject
===
'
string
'
?
JSON
.
parse
(
currentProject
)
:
currentProject
;
}
$els
=
$
(
els
);
this
.
init
(
els
,
options
);
}
init
(
els
,
options
)
{
let
$els
=
$
(
els
);
if
(
!
els
)
{
$els
=
$
(
'
.js-milestone-select
'
);
}
$els
.
each
(
function
(
i
,
dropdown
)
{
var
$block
,
$dropdown
,
$loading
,
$selectbox
,
$sidebarCollapsedValue
,
$value
,
abilityName
,
collapsedSidebarLabelTemplate
,
defaultLabel
,
defaultNo
,
issuableId
,
issueUpdateURL
,
milestoneLinkNoneTemplate
,
milestoneLinkTemplate
,
milestonesUrl
,
projectId
,
selectedMilestone
,
selectedMilestoneDefault
,
showAny
,
showNo
,
showUpcoming
,
showStarted
,
useId
,
showMenuAbove
;
$dropdown
=
$
(
dropdown
);
projectId
=
$dropdown
.
data
(
'
project-id
'
);
milestonesUrl
=
$dropdown
.
data
(
'
milestones
'
);
issueUpdateURL
=
$dropdown
.
data
(
'
issueUpdate
'
);
showNo
=
$dropdown
.
data
(
'
show-no
'
);
showAny
=
$dropdown
.
data
(
'
show-any
'
);
showMenuAbove
=
$dropdown
.
data
(
'
showMenuAbove
'
);
showUpcoming
=
$dropdown
.
data
(
'
show-upcoming
'
);
showStarted
=
$dropdown
.
data
(
'
show-started
'
);
useId
=
$dropdown
.
data
(
'
use-id
'
);
defaultLabel
=
$dropdown
.
data
(
'
default-label
'
);
defaultNo
=
$dropdown
.
data
(
'
default-no
'
);
issuableId
=
$dropdown
.
data
(
'
issuable-id
'
);
abilityName
=
$dropdown
.
data
(
'
ability-name
'
);
$selectb
ox
=
$dropdown
.
closest
(
'
.selectbox
'
);
$block
=
$selectb
ox
.
closest
(
'
.block
'
);
$sidebarCollapsedValue
=
$block
.
find
(
'
.sidebar-collapsed-icon
'
);
$value
=
$block
.
find
(
'
.value
'
);
$loading
=
$block
.
find
(
'
.block-loading
'
).
fadeOut
();
$els
.
each
((
i
,
dropdown
)
=>
{
let
collapsedSidebarLabelTemplate
,
milestoneLinkNoneTemplate
,
milestoneLinkTemplate
,
selectedMilestone
,
selectedMilestoneDefault
;
const
$dropdown
=
$
(
dropdown
);
const
projectId
=
$dropdown
.
data
(
'
project-id
'
);
const
milestonesUrl
=
$dropdown
.
data
(
'
milestones
'
);
const
issueUpdateURL
=
$dropdown
.
data
(
'
issueUpdate
'
);
const
showNo
=
$dropdown
.
data
(
'
show-no
'
);
const
showAny
=
$dropdown
.
data
(
'
show-any
'
);
const
showMenuAbove
=
$dropdown
.
data
(
'
showMenuAbove
'
);
const
showUpcoming
=
$dropdown
.
data
(
'
show-upcoming
'
);
const
showStarted
=
$dropdown
.
data
(
'
show-started
'
);
const
useId
=
$dropdown
.
data
(
'
use-id
'
);
const
defaultLabel
=
$dropdown
.
data
(
'
default-label
'
);
const
defaultNo
=
$dropdown
.
data
(
'
default-no
'
);
const
issuableId
=
$dropdown
.
data
(
'
issuable-id
'
);
const
abilityName
=
$dropdown
.
data
(
'
ability-name
'
);
const
$selectB
ox
=
$dropdown
.
closest
(
'
.selectbox
'
);
const
$block
=
$selectB
ox
.
closest
(
'
.block
'
);
const
$sidebarCollapsedValue
=
$block
.
find
(
'
.sidebar-collapsed-icon
'
);
const
$value
=
$block
.
find
(
'
.value
'
);
const
$loading
=
$block
.
find
(
'
.block-loading
'
).
fadeOut
();
selectedMilestoneDefault
=
(
showAny
?
''
:
null
);
selectedMilestoneDefault
=
(
showNo
&&
defaultNo
?
'
No Milestone
'
:
selectedMilestoneDefault
);
selectedMilestone
=
$dropdown
.
data
(
'
selected
'
)
||
selectedMilestoneDefault
;
if
(
issueUpdateURL
)
{
milestoneLinkTemplate
=
_
.
template
(
'
<a href="/<%- full_path %>/milestones/<%- iid %>" class="bold has-tooltip" data-container="body" title="<%- remaining %>"><%- title %></a>
'
);
milestoneLinkNoneTemplate
=
'
<span class="no-value">None</span>
'
;
...
...
@@ -50,11 +52,10 @@ import { timeFor } from './lib/utils/datetime_utility';
}
return
$dropdown
.
glDropdown
({
showMenuAbove
:
showMenuAbove
,
data
:
function
(
term
,
callback
)
{
return
$
.
ajax
({
data
:
(
term
,
callback
)
=>
$
.
ajax
({
url
:
milestonesUrl
}).
done
(
function
(
data
)
{
var
extraOptions
=
[];
}).
done
((
data
)
=>
{
const
extraOptions
=
[];
if
(
showAny
)
{
extraOptions
.
push
({
id
:
0
,
...
...
@@ -92,23 +93,20 @@ import { timeFor } from './lib/utils/datetime_utility';
$dropdown
.
data
(
'
glDropdown
'
).
positionMenuAbove
();
}
$
(
`[data-milestone-id="
${
selectedMilestone
}
"] > a`
).
addClass
(
'
is-active
'
);
});
},
renderRow
:
function
(
milestone
)
{
return
`
}),
renderRow
:
milestone
=>
`
<li data-milestone-id="
${
milestone
.
name
}
">
<a href='#' class='dropdown-menu-milestone-link'>
${
_
.
escape
(
milestone
.
title
)}
</a>
</li>
`
;
},
`
,
filterable
:
true
,
search
:
{
fields
:
[
'
title
'
]
},
selectable
:
true
,
toggleLabel
:
function
(
selected
,
el
,
e
)
{
toggleLabel
:
(
selected
,
el
,
e
)
=>
{
if
(
selected
&&
'
id
'
in
selected
&&
$
(
el
).
hasClass
(
'
is-active
'
))
{
return
selected
.
title
;
}
else
{
...
...
@@ -117,25 +115,21 @@ import { timeFor } from './lib/utils/datetime_utility';
},
defaultLabel
:
defaultLabel
,
fieldName
:
$dropdown
.
data
(
'
field-name
'
),
text
:
function
(
milestone
)
{
return
_
.
escape
(
milestone
.
title
);
},
id
:
function
(
milestone
)
{
text
:
milestone
=>
_
.
escape
(
milestone
.
title
),
id
:
(
milestone
)
=>
{
if
(
!
useId
&&
!
$dropdown
.
is
(
'
.js-issuable-form-dropdown
'
))
{
return
milestone
.
name
;
}
else
{
return
milestone
.
id
;
}
},
isSelected
:
function
(
milestone
)
{
return
milestone
.
name
===
selectedMilestone
;
},
hidden
:
function
()
{
$selectbox
.
hide
();
isSelected
:
milestone
=>
milestone
.
name
===
selectedMilestone
,
hidden
:
()
=>
{
$selectBox
.
hide
();
// display:block overrides the hide-collapse rule
return
$value
.
css
(
'
display
'
,
''
);
},
opened
:
function
(
e
)
{
opened
:
(
e
)
=>
{
const
$el
=
$
(
e
.
currentTarget
);
if
(
$dropdown
.
hasClass
(
'
js-issue-board-sidebar
'
)
||
options
.
handleClick
)
{
selectedMilestone
=
$dropdown
[
0
].
dataset
.
selected
||
selectedMilestoneDefault
;
...
...
@@ -144,11 +138,11 @@ import { timeFor } from './lib/utils/datetime_utility';
$
(
`[data-milestone-id="
${
selectedMilestone
}
"] > a`
,
$el
).
addClass
(
'
is-active
'
);
},
vue
:
$dropdown
.
hasClass
(
'
js-issue-board-sidebar
'
),
clicked
:
function
(
clickEvent
)
{
clicked
:
(
clickEvent
)
=>
{
const
{
$el
,
e
}
=
clickEvent
;
let
selected
=
clickEvent
.
selectedObj
;
var
data
,
isIssueIndex
,
isMRIndex
,
isSelecting
,
page
,
boardsStore
;
let
data
,
boardsStore
;
if
(
!
selected
)
return
;
if
(
options
.
handleClick
)
{
...
...
@@ -157,10 +151,10 @@ import { timeFor } from './lib/utils/datetime_utility';
return
;
}
page
=
$
(
'
body
'
).
attr
(
'
data-page
'
);
isIssueIndex
=
page
===
'
projects:issues:index
'
;
isMRIndex
=
(
page
===
page
&&
page
===
'
projects:merge_requests:index
'
);
isSelecting
=
(
selected
.
name
!==
selectedMilestone
);
const
page
=
$
(
'
body
'
).
attr
(
'
data-page
'
);
const
isIssueIndex
=
page
===
'
projects:issues:index
'
;
const
isMRIndex
=
(
page
===
page
&&
page
===
'
projects:merge_requests:index
'
);
const
isSelecting
=
(
selected
.
name
!==
selectedMilestone
);
selectedMilestone
=
isSelecting
?
selected
.
name
:
selectedMilestoneDefault
;
if
(
$dropdown
.
hasClass
(
'
js-filter-bulk-update
'
)
||
$dropdown
.
hasClass
(
'
js-issuable-form-dropdown
'
))
{
e
.
preventDefault
();
...
...
@@ -192,7 +186,7 @@ import { timeFor } from './lib/utils/datetime_utility';
$loading
.
removeClass
(
'
hidden
'
).
fadeIn
();
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
.
update
(
$dropdown
.
attr
(
'
data-issue-update
'
))
.
then
(
function
()
{
.
then
(()
=>
{
$dropdown
.
trigger
(
'
loaded.gl.dropdown
'
);
$loading
.
fadeOut
();
})
...
...
@@ -200,7 +194,7 @@ import { timeFor } from './lib/utils/datetime_utility';
$loading
.
fadeOut
();
});
}
else
{
selected
=
$selectb
ox
.
find
(
'
input[type="hidden"]
'
).
val
();
selected
=
$selectB
ox
.
find
(
'
input[type="hidden"]
'
).
val
();
data
=
{};
data
[
abilityName
]
=
{};
data
[
abilityName
].
milestone_id
=
selected
!=
null
?
selected
:
null
;
...
...
@@ -210,13 +204,13 @@ import { timeFor } from './lib/utils/datetime_utility';
type
:
'
PUT
'
,
url
:
issueUpdateURL
,
data
:
data
}).
done
(
function
(
data
)
{
}).
done
((
data
)
=>
{
$dropdown
.
trigger
(
'
loaded.gl.dropdown
'
);
$loading
.
fadeOut
();
$selectb
ox
.
hide
();
$selectB
ox
.
hide
();
$value
.
css
(
'
display
'
,
''
);
if
(
data
.
milestone
!=
null
)
{
data
.
milestone
.
full_path
=
_
this
.
currentProject
.
full_path
;
data
.
milestone
.
full_path
=
this
.
currentProject
.
full_path
;
data
.
milestone
.
remaining
=
timeFor
(
data
.
milestone
.
due_date
);
data
.
milestone
.
name
=
data
.
milestone
.
title
;
$value
.
html
(
milestoneLinkTemplate
(
data
.
milestone
));
...
...
@@ -231,7 +225,4 @@ import { timeFor } from './lib/utils/datetime_utility';
});
});
}
return
MilestoneSelect
;
})();
}).
call
(
window
);
}
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