diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-22 18:11:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-22 18:11:25 +0300 |
commit | adaa4599f18149e0fb8f8e120a7ed8e7d05e36be (patch) | |
tree | 34ea300a8c567d27409abd8169f86a37450acd23 /app/assets/javascripts/search | |
parent | 581c9c958dd3c7c28370f234fcb3c13c60453888 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/search')
-rw-r--r-- | app/assets/javascripts/search/index.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/search/under_topbar/index.js | 31 |
2 files changed, 33 insertions, 2 deletions
diff --git a/app/assets/javascripts/search/index.js b/app/assets/javascripts/search/index.js index d9d4056466a..446ab7f433c 100644 --- a/app/assets/javascripts/search/index.js +++ b/app/assets/javascripts/search/index.js @@ -1,11 +1,11 @@ import setHighlightClass from 'ee_else_ce/search/highlight_blob_search_result'; import { queryToObject } from '~/lib/utils/url_utility'; -import Project from '~/pages/projects/project'; import refreshCounts from '~/pages/search/show/refresh_counts'; import { initSidebar } from './sidebar'; import { initSearchSort } from './sort'; import createStore from './store'; import { initTopbar } from './topbar'; +import { initBlobRefSwitcher } from './under_topbar'; export const initSearchApp = () => { const query = queryToObject(window.location.search); @@ -18,5 +18,5 @@ export const initSearchApp = () => { setHighlightClass(query.search); // Code Highlighting refreshCounts(); // Other Scope Tab Counts - Project.initRefSwitcher(); // Code Search Branch Picker + initBlobRefSwitcher(); // Code Search Branch Picker }; diff --git a/app/assets/javascripts/search/under_topbar/index.js b/app/assets/javascripts/search/under_topbar/index.js new file mode 100644 index 00000000000..8e50c6655dd --- /dev/null +++ b/app/assets/javascripts/search/under_topbar/index.js @@ -0,0 +1,31 @@ +import Vue from 'vue'; +import Translate from '~/vue_shared/translate'; +import RefSelector from '~/ref/components/ref_selector.vue'; +import { setUrlParams, visitUrl } from '~/lib/utils/url_utility'; + +Vue.use(Translate); + +export const initBlobRefSwitcher = () => { + const el = document.getElementById('js-blob-ref-switcher'); + + if (!el) return false; + + const { projectId, ref, fieldName } = el.dataset; + + return new Vue({ + el, + render(createElement) { + return createElement(RefSelector, { + props: { + projectId, + value: ref, + }, + on: { + input(selected) { + visitUrl(setUrlParams({ [fieldName]: selected })); + }, + }, + }); + }, + }); +}; |