diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-09-29 13:22:27 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-09-29 13:22:27 +0000 |
commit | 5307844c9a2d90410933bf0a20c95cf7e1c9f417 (patch) | |
tree | 3fc07428a2e272375c1890af5cb1b87ece294497 /app/assets/javascripts/repo | |
parent | 60e40007c5a5877092e2e8e5e42d87b3d8a213b8 (diff) | |
parent | ef22b0dc813b9e1579ac4f25de2eaf8bf66a8236 (diff) | |
download | gitlab-ce-5307844c9a2d90410933bf0a20c95cf7e1c9f417.tar.gz |
Merge branch 'dm-json-page-title' into 'master'
Use backend-provided page title in repo editor
Closes #36029
See merge request gitlab-org/gitlab-ce!13763
Diffstat (limited to 'app/assets/javascripts/repo')
-rw-r--r-- | app/assets/javascripts/repo/helpers/repo_helper.js | 10 | ||||
-rw-r--r-- | app/assets/javascripts/repo/stores/repo_store.js | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/repo/helpers/repo_helper.js b/app/assets/javascripts/repo/helpers/repo_helper.js index 2c960a147c2..ac59a2bed23 100644 --- a/app/assets/javascripts/repo/helpers/repo_helper.js +++ b/app/assets/javascripts/repo/helpers/repo_helper.js @@ -58,13 +58,13 @@ const RepoHelper = { return langs.find(lang => lang.extensions && lang.extensions.indexOf(`.${ext}`) > -1); }, - setDirectoryOpen(tree) { + setDirectoryOpen(tree, title) { const file = tree; if (!file) return undefined; file.opened = true; file.icon = 'fa-folder-open'; - RepoHelper.updateHistoryEntry(file.url, file.name); + RepoHelper.updateHistoryEntry(file.url, title); return file; }, @@ -135,6 +135,8 @@ const RepoHelper = { return Service.getContent() .then((response) => { const data = response.data; + if (response.headers && response.headers['page-title']) data.pageTitle = response.headers['page-title']; + Store.isTree = RepoHelper.isTree(data); if (!Store.isTree) { if (!file) file = data; @@ -168,7 +170,7 @@ const RepoHelper = { } else { // it's a tree if (!file) Store.isRoot = RepoHelper.isRoot(Service.url); - file = RepoHelper.setDirectoryOpen(file); + file = RepoHelper.setDirectoryOpen(file, data.pageTitle || data.name); const newDirectory = RepoHelper.dataToListOfFiles(data); Store.addFilesToDirectory(file, Store.files, newDirectory); Store.prevURL = Service.blobURLtoParentTree(Service.url); @@ -255,7 +257,7 @@ const RepoHelper = { history.pushState({ key: RepoHelper.key }, '', url); if (title) { - document.title = `${title} ยท GitLab`; + document.title = title; } }, diff --git a/app/assets/javascripts/repo/stores/repo_store.js b/app/assets/javascripts/repo/stores/repo_store.js index c9b0413e745..9a4fc40bc69 100644 --- a/app/assets/javascripts/repo/stores/repo_store.js +++ b/app/assets/javascripts/repo/stores/repo_store.js @@ -83,7 +83,7 @@ const RepoStore = { }).catch(Helper.loadingError); } - if (!file.loading) Helper.updateHistoryEntry(file.url, file.name); + if (!file.loading) Helper.updateHistoryEntry(file.url, file.pageTitle || file.name); RepoStore.binary = file.binary; }, |