diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 09:16:11 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 09:16:11 +0000 |
commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /app/assets/javascripts/issuable/index.js | |
parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) | |
download | gitlab-ce-edaa33dee2ff2f7ea3fac488d41558eb5f86d68c.tar.gz |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'app/assets/javascripts/issuable/index.js')
-rw-r--r-- | app/assets/javascripts/issuable/index.js | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/app/assets/javascripts/issuable/index.js b/app/assets/javascripts/issuable/index.js index 072422944f5..57bad5182e7 100644 --- a/app/assets/javascripts/issuable/index.js +++ b/app/assets/javascripts/issuable/index.js @@ -11,7 +11,9 @@ import IssuableHeaderWarnings from './components/issuable_header_warnings.vue'; export function initCsvImportExportButtons() { const el = document.querySelector('.js-csv-import-export-buttons'); - if (!el) return null; + if (!el) { + return null; + } const { showExportButton, @@ -42,23 +44,24 @@ export function initCsvImportExportButtons() { maxAttachmentSize, showLabel, }, - render(h) { - return h(CsvImportExportButtons, { + render: (createElement) => + createElement(CsvImportExportButtons, { props: { exportCsvPath, issuableCount: parseInt(issuableCount, 10), }, - }); - }, + }), }); } export function initIssuableByEmail() { - Vue.use(GlToast); - const el = document.querySelector('.js-issuable-by-email'); - if (!el) return null; + if (!el) { + return null; + } + + Vue.use(GlToast); const { initialEmail, @@ -79,9 +82,7 @@ export function initIssuableByEmail() { markdownHelpPath, resetPath, }, - render(h) { - return h(IssuableByEmail); - }, + render: (createElement) => createElement(IssuableByEmail), }); } @@ -89,7 +90,7 @@ export function initIssuableHeaderWarnings(store) { const el = document.getElementById('js-issuable-header-warnings'); if (!el) { - return false; + return null; } const { hidden } = el.dataset; @@ -98,18 +99,18 @@ export function initIssuableHeaderWarnings(store) { el, store, provide: { hidden: parseBoolean(hidden) }, - render(createElement) { - return createElement(IssuableHeaderWarnings); - }, + render: (createElement) => createElement(IssuableHeaderWarnings), }); } export function initIssuableSidebar() { - const sidebarOptEl = document.querySelector('.js-sidebar-options'); + const el = document.querySelector('.js-sidebar-options'); - if (!sidebarOptEl) return; + if (!el) { + return; + } - const sidebarOptions = getSidebarOptions(sidebarOptEl); + const sidebarOptions = getSidebarOptions(el); new IssuableContext(sidebarOptions.currentUser); // eslint-disable-line no-new Sidebar.initialize(); |