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
47f6dbdf
Commit
47f6dbdf
authored
Jan 24, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ph-even-more-dispatcher-imports' into 'master'
Added imports for dispatcher routes See merge request gitlab-org/gitlab-ce!16640
parents
0f5f77a0
e22c007f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
21 deletions
+13
-21
dispatcher.js
app/assets/javascripts/dispatcher.js
+3
-17
index.js
app/assets/javascripts/pages/projects/show/index.js
+4
-0
index.js
app/assets/javascripts/pages/projects/snippets/show/index.js
+4
-0
_head.html.haml
app/views/layouts/_head.html.haml
+0
-1
webpack.config.js
config/webpack.config.js
+2
-3
No files found.
app/assets/javascripts/dispatcher.js
View file @
47f6dbdf
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-arrow-callback, wrap-iife, no-shadow, consistent-return, one-var, one-var-declaration-per-line, camelcase, default-case, no-new, quotes, no-duplicate-case, no-case-declarations, no-fallthrough, max-len */
import
notificationsDropdown
from
'./notifications_dropdown'
;
import
LineHighlighter
from
'./line_highlighter'
;
import
MergeRequest
from
'./merge_request'
;
import
Flash
from
'./flash'
;
import
BlobViewer
from
'./blob/viewer/index'
;
import
GfmAutoComplete
from
'./gfm_auto_complete'
;
import
Star
from
'./star'
;
import
ZenMode
from
'./zen_mode'
;
import
PerformanceBar
from
'./performance_bar'
;
import
initNotes
from
'./init_notes'
;
import
initIssuableSidebar
from
'./init_issuable_sidebar'
;
import
{
convertPermissionToBoolean
}
from
'./lib/utils/common_utils'
;
...
...
@@ -621,23 +616,12 @@ import SearchAutocomplete from './search_autocomplete';
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'show'
:
new
Star
();
notificationsDropdown
();
break
;
case
'wikis'
:
import
(
'./pages/projects/wikis'
)
.
then
(
callDefault
)
.
catch
(
fail
);
shortcut_handler
=
true
;
break
;
case
'snippets'
:
if
(
path
[
2
]
===
'show'
)
{
new
ZenMode
();
new
LineHighlighter
();
new
BlobViewer
();
}
break
;
}
break
;
}
...
...
@@ -647,7 +631,9 @@ import SearchAutocomplete from './search_autocomplete';
}
if
(
document
.
querySelector
(
'#peek'
))
{
new
PerformanceBar
({
container
:
'#peek'
});
import
(
'./performance_bar'
)
.
then
(
m
=>
new
m
.
default
({
container
:
'#peek'
}))
// eslint-disable-line new-cap
.
catch
(
fail
);
}
};
...
...
app/assets/javascripts/pages/projects/show/index.js
View file @
47f6dbdf
...
...
@@ -5,8 +5,12 @@ import TreeView from '~/tree';
import
BlobViewer
from
'~/blob/viewer/index'
;
import
Activities
from
'~/activities'
;
import
{
ajaxGet
}
from
'~/lib/utils/common_utils'
;
import
Star
from
'../../../star'
;
import
notificationsDropdown
from
'../../../notifications_dropdown'
;
export
default
()
=>
{
new
Star
();
// eslint-disable-line no-new
notificationsDropdown
();
new
ShortcutsNavigation
();
// eslint-disable-line no-new
new
NotificationsForm
();
// eslint-disable-line no-new
new
UserCallout
({
// eslint-disable-line no-new
...
...
app/assets/javascripts/pages/projects/snippets/show/index.js
View file @
47f6dbdf
import
initNotes
from
'~/init_notes'
;
import
ZenMode
from
'~/zen_mode'
;
import
LineHighlighter
from
'../../../../line_highlighter'
;
import
BlobViewer
from
'../../../../blob/viewer'
;
export
default
function
()
{
new
LineHighlighter
();
// eslint-disable-line no-new
new
BlobViewer
();
// eslint-disable-line no-new
initNotes
();
new
ZenMode
();
// eslint-disable-line no-new
}
app/views/layouts/_head.html.haml
View file @
47f6dbdf
...
...
@@ -43,7 +43,6 @@
=
webpack_bundle_tag
"main"
=
webpack_bundle_tag
"raven"
if
current_application_settings
.
clientside_sentry_enabled
=
webpack_bundle_tag
"test"
if
Rails
.
env
.
test?
=
webpack_bundle_tag
'performance_bar'
if
performance_bar_enabled?
-
if
content_for?
(
:page_specific_javascripts
)
=
yield
:page_specific_javascripts
...
...
config/webpack.config.js
View file @
47f6dbdf
...
...
@@ -85,7 +85,6 @@ var config = {
test
:
'./test.js'
,
two_factor_auth
:
'./two_factor_auth.js'
,
users
:
'./users/index.js'
,
performance_bar
:
'./performance_bar.js'
,
webpack_runtime
:
'./webpack.js'
,
},
...
...
@@ -119,9 +118,9 @@ var config = {
{
test
:
/
\_
worker
\.
js$/
,
use
:
[
{
{
loader
:
'worker-loader'
,
options
:
{
options
:
{
inline
:
true
}
},
...
...
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