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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
6ead98de
Commit
6ead98de
authored
Apr 24, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] fix eslint
parent
bd6e14d1
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
9 deletions
+19
-9
app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.js
...scripts/sidebar/components/assignees/sidebar_assignees.js
+5
-3
app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js
...sidebar/components/time_tracking/sidebar_time_tracking.js
+0
-1
app/assets/javascripts/sidebar/sidebar_mediator.js
app/assets/javascripts/sidebar/sidebar_mediator.js
+4
-2
app/assets/javascripts/sidebar/stores/sidebar_store.js
app/assets/javascripts/sidebar/stores/sidebar_store.js
+1
-1
app/assets/javascripts/users_select.js
app/assets/javascripts/users_select.js
+8
-1
spec/javascripts/issuable_time_tracker_spec.js
spec/javascripts/issuable_time_tracker_spec.js
+1
-1
No files found.
app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.js
View file @
6ead98de
...
...
@@ -18,7 +18,7 @@ export default {
},
components
:
{
'
assignee-title
'
:
AssigneeTitle
,
'
assignees
'
:
Assignees
,
assignees
:
Assignees
,
},
computed
:
{
numberOfAssignees
()
{
...
...
@@ -35,8 +35,10 @@ export default {
},
saveUsers
()
{
this
.
loading
=
true
;
this
.
mediator
.
saveSelectedUsers
(
this
.
field
).
then
(()
=>
this
.
loading
=
false
);
}
this
.
mediator
.
saveSelectedUsers
(
this
.
field
).
then
(()
=>
{
this
.
loading
=
false
;
});
},
},
created
()
{
// Get events from glDropdown
...
...
app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js
View file @
6ead98de
import
'
~/smart_interval
'
;
import
timeTracker
from
'
./time_tracker
'
;
import
eventHub
from
'
../../event_hub
'
;
import
Store
from
'
../../stores/sidebar_store
'
;
import
Mediator
from
'
../../sidebar_mediator
'
;
...
...
app/assets/javascripts/sidebar/sidebar_mediator.js
View file @
6ead98de
/* global Flash */
import
Service
from
'
./services/sidebar_service
'
;
import
Store
from
'
./stores/sidebar_store
'
;
...
...
@@ -12,8 +14,8 @@ export default class SidebarMediator {
return
SidebarMediator
.
singleton
;
}
assignYourself
(
field
)
{
this
.
store
.
addUserId
(
store
.
currentUserId
);
assignYourself
()
{
this
.
store
.
addUserId
(
this
.
store
.
currentUserId
);
}
saveSelectedUsers
(
field
)
{
...
...
app/assets/javascripts/sidebar/stores/sidebar_store.js
View file @
6ead98de
...
...
@@ -46,4 +46,4 @@ export default class SidebarStore {
removeAllUserIds
()
{
this
.
selectedUserIds
=
[];
}
}
;
}
app/assets/javascripts/users_select.js
View file @
6ead98de
...
...
@@ -2,6 +2,7 @@
/* global Issuable */
/* global ListUser */
import
Vue
from
'
vue
'
;
import
eventHub
from
'
./sidebar/event_hub
'
;
(
function
()
{
...
...
@@ -163,7 +164,13 @@ import eventHub from './sidebar/event_hub';
}.
bind
(
this
));
},
processData
:
function
(
term
,
users
,
callback
)
{
var
anyUser
,
index
,
j
,
len
,
name
,
obj
,
showDivider
;
let
anyUser
;
let
index
;
let
j
;
let
len
;
let
name
;
let
obj
;
let
showDivider
;
if
(
term
.
length
===
0
)
{
showDivider
=
0
;
if
(
firstUser
)
{
...
...
spec/javascripts/issuable_time_tracker_spec.js
View file @
6ead98de
...
...
@@ -2,7 +2,7 @@
import
Vue
from
'
vue
'
;
import
'
~/
issuable
/components/time_tracking/time_tracker
'
;
import
'
~/
sidebar
/components/time_tracking/time_tracker
'
;
function
initTimeTrackingComponent
(
opts
)
{
setFixtures
(
`
...
...
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