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
ecf54c23
Commit
ecf54c23
authored
May 24, 2019
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update document title when repository router changes
parent
c0ea4164
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
3 deletions
+29
-3
app/assets/javascripts/repository/index.js
app/assets/javascripts/repository/index.js
+6
-2
app/assets/javascripts/repository/utils/title.js
app/assets/javascripts/repository/utils/title.js
+7
-0
app/views/projects/_files.html.haml
app/views/projects/_files.html.haml
+1
-1
spec/frontend/repository/utils/title_spec.js
spec/frontend/repository/utils/title_spec.js
+15
-0
No files found.
app/assets/javascripts/repository/index.js
View file @
ecf54c23
...
@@ -2,10 +2,12 @@ import Vue from 'vue';
...
@@ -2,10 +2,12 @@ import Vue from 'vue';
import
createRouter
from
'
./router
'
;
import
createRouter
from
'
./router
'
;
import
App
from
'
./components/app.vue
'
;
import
App
from
'
./components/app.vue
'
;
import
apolloProvider
from
'
./graphql
'
;
import
apolloProvider
from
'
./graphql
'
;
import
{
setTitle
}
from
'
./utils/title
'
;
export
default
function
setupVueRepositoryList
()
{
export
default
function
setupVueRepositoryList
()
{
const
el
=
document
.
getElementById
(
'
js-tree-list
'
);
const
el
=
document
.
getElementById
(
'
js-tree-list
'
);
const
{
projectPath
,
ref
}
=
el
.
dataset
;
const
{
projectPath
,
ref
,
fullName
}
=
el
.
dataset
;
const
router
=
createRouter
(
projectPath
,
ref
);
apolloProvider
.
clients
.
defaultClient
.
cache
.
writeData
({
apolloProvider
.
clients
.
defaultClient
.
cache
.
writeData
({
data
:
{
data
:
{
...
@@ -14,9 +16,11 @@ export default function setupVueRepositoryList() {
...
@@ -14,9 +16,11 @@ export default function setupVueRepositoryList() {
},
},
});
});
router
.
afterEach
(({
params
:
{
pathMatch
}
})
=>
setTitle
(
pathMatch
,
ref
,
fullName
));
return
new
Vue
({
return
new
Vue
({
el
,
el
,
router
:
createRouter
(
projectPath
,
ref
)
,
router
,
apolloProvider
,
apolloProvider
,
render
(
h
)
{
render
(
h
)
{
return
h
(
App
);
return
h
(
App
);
...
...
app/assets/javascripts/repository/utils/title.js
0 → 100644
View file @
ecf54c23
// eslint-disable-next-line import/prefer-default-export
export
const
setTitle
=
(
pathMatch
,
ref
,
project
)
=>
{
const
path
=
pathMatch
.
replace
(
/^
\/
/
,
''
);
const
isEmpty
=
path
===
''
;
document
.
title
=
`
${
isEmpty
?
'
Files
'
:
path
}
·
${
ref
}
·
${
project
}
`
;
};
app/views/projects/_files.html.haml
View file @
ecf54c23
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
=
render
'stat_anchor_list'
,
anchors:
@project
.
statistics_buttons
(
show_auto_devops_callout:
show_auto_devops_callout
)
=
render
'stat_anchor_list'
,
anchors:
@project
.
statistics_buttons
(
show_auto_devops_callout:
show_auto_devops_callout
)
-
if
vue_file_list
-
if
vue_file_list
#js-tree-list
{
data:
{
project_path:
@project
.
full_path
,
ref:
ref
}
}
#js-tree-list
{
data:
{
project_path:
@project
.
full_path
,
full_name:
@project
.
name_with_namespace
,
ref:
ref
}
}
-
if
@tree
.
readme
-
if
@tree
.
readme
=
render
"projects/tree/readme"
,
readme:
@tree
.
readme
=
render
"projects/tree/readme"
,
readme:
@tree
.
readme
-
else
-
else
...
...
spec/frontend/repository/utils/title_spec.js
0 → 100644
View file @
ecf54c23
import
{
setTitle
}
from
'
~/repository/utils/title
'
;
describe
(
'
setTitle
'
,
()
=>
{
it
.
each
`
path | title
${
'
/
'
}
|
${
'
Files
'
}
${
'
app
'
}
|
${
'
app
'
}
${
'
app/assets
'
}
|
${
'
app/assets
'
}
${
'
app/assets/javascripts
'
}
|
${
'
app/assets/javascripts
'
}
`
(
'
sets document title as $title for $path
'
,
({
path
,
title
})
=>
{
setTitle
(
path
,
'
master
'
,
'
GitLab
'
);
expect
(
document
.
title
).
toEqual
(
`
${
title
}
· master · GitLab`
);
});
});
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