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
cd16600e
Commit
cd16600e
authored
Jan 08, 2018
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dispatcher-dashboard-todos' into 'master'
Refactor dashboard todos inside dispatcher See merge request gitlab-org/gitlab-ce!16065
parents
8a7bbe1f
4c1e1ab1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
7 deletions
+10
-7
dispatcher.js
app/assets/javascripts/dispatcher.js
+3
-3
index.js
app/assets/javascripts/pages/dashboard/todos/index/index.js
+3
-0
todos.js
app/assets/javascripts/pages/dashboard/todos/index/todos.js
+3
-3
todos_spec.js
spec/javascripts/todos_spec.js
+1
-1
No files found.
app/assets/javascripts/dispatcher.js
View file @
cd16600e
...
...
@@ -56,7 +56,6 @@ import GfmAutoComplete from './gfm_auto_complete';
import
ShortcutsBlob
from
'./shortcuts_blob'
;
import
SigninTabsMemoizer
from
'./signin_tabs_memoizer'
;
import
Star
from
'./star'
;
import
Todos
from
'./todos'
;
import
TreeView
from
'./tree'
;
import
UsagePing
from
'./usage_ping'
;
import
UsernameValidator
from
'./username_validator'
;
...
...
@@ -111,6 +110,7 @@ import Activities from './activities';
}
const
fail
=
()
=>
Flash
(
'Error loading dynamic module'
);
const
callDefault
=
m
=>
m
.
default
();
path
=
page
.
split
(
':'
);
shortcut_handler
=
null
;
...
...
@@ -212,7 +212,7 @@ import Activities from './activities';
projectSelect
();
break
;
case
'dashboard:todos:index'
:
new
Todos
(
);
import
(
'./pages/dashboard/todos/index'
).
then
(
callDefault
).
catch
(
fail
);
break
;
case
'dashboard:projects:index'
:
case
'dashboard:projects:starred'
:
...
...
@@ -542,7 +542,7 @@ import Activities from './activities';
new
CILintEditor
();
break
;
case
'users:show'
:
import
(
'./pages/users/show'
).
then
(
m
=>
m
.
default
()
).
catch
(
fail
);
import
(
'./pages/users/show'
).
then
(
callDefault
).
catch
(
fail
);
break
;
case
'admin:conversational_development_index:show'
:
new
UserCallout
();
...
...
app/assets/javascripts/pages/dashboard/todos/index/index.js
0 → 100644
View file @
cd16600e
import
Todos
from
'./todos'
;
export
default
()
=>
new
Todos
();
app/assets/javascripts/todos.js
→
app/assets/javascripts/
pages/dashboard/todos/index/
todos.js
View file @
cd16600e
/* eslint-disable class-methods-use-this, no-unneeded-ternary, quote-props */
import
{
visitUrl
}
from
'
.
/lib/utils/url_utility'
;
import
UsersSelect
from
'
.
/users_select'
;
import
{
isMetaClick
}
from
'
.
/lib/utils/common_utils'
;
import
{
visitUrl
}
from
'
~
/lib/utils/url_utility'
;
import
UsersSelect
from
'
~
/users_select'
;
import
{
isMetaClick
}
from
'
~
/lib/utils/common_utils'
;
export
default
class
Todos
{
constructor
()
{
...
...
spec/javascripts/todos_spec.js
View file @
cd16600e
import
*
as
urlUtils
from
'~/lib/utils/url_utility'
;
import
Todos
from
'~/todos'
;
import
Todos
from
'~/
pages/dashboard/todos/index/
todos'
;
import
'~/lib/utils/common_utils'
;
describe
(
'Todos'
,
()
=>
{
...
...
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