diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-09 03:12:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-09 03:12:30 +0300 |
commit | 2c41816276a9bb5c12176cb2d2b54c4d19c0ce2c (patch) | |
tree | c6e70704f016d12025aca98691a8b7eda7eaca70 /app | |
parent | 59e6c2df22c69baa791529db3326e68c9de10b54 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/pages/projects/wikis/diff/index.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/wikis/edit/index.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/wikis/git_access/index.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/wikis/index.js | 6 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/wikis/show/index.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/pages/shared/wikis/async_edit.js | 11 | ||||
-rw-r--r-- | app/assets/javascripts/pages/shared/wikis/edit.js (renamed from app/assets/javascripts/pages/shared/wikis/index.js) | 12 | ||||
-rw-r--r-- | app/assets/javascripts/pages/shared/wikis/wikis.js | 6 | ||||
-rw-r--r-- | app/views/shared/wikis/edit.html.haml | 2 |
9 files changed, 36 insertions, 13 deletions
diff --git a/app/assets/javascripts/pages/projects/wikis/diff/index.js b/app/assets/javascripts/pages/projects/wikis/diff/index.js new file mode 100644 index 00000000000..73440db761f --- /dev/null +++ b/app/assets/javascripts/pages/projects/wikis/diff/index.js @@ -0,0 +1,3 @@ +import { initDiffStatsDropdown } from '~/init_diff_stats_dropdown'; + +initDiffStatsDropdown(); diff --git a/app/assets/javascripts/pages/projects/wikis/edit/index.js b/app/assets/javascripts/pages/projects/wikis/edit/index.js new file mode 100644 index 00000000000..b2288c2655c --- /dev/null +++ b/app/assets/javascripts/pages/projects/wikis/edit/index.js @@ -0,0 +1,3 @@ +import { mountApplications } from '~/pages/shared/wikis/edit'; + +mountApplications(); diff --git a/app/assets/javascripts/pages/projects/wikis/git_access/index.js b/app/assets/javascripts/pages/projects/wikis/git_access/index.js new file mode 100644 index 00000000000..b1f3006bc1a --- /dev/null +++ b/app/assets/javascripts/pages/projects/wikis/git_access/index.js @@ -0,0 +1,3 @@ +import initClonePanel from '~/clone_panel'; + +initClonePanel(); diff --git a/app/assets/javascripts/pages/projects/wikis/index.js b/app/assets/javascripts/pages/projects/wikis/index.js index 2c1f9e634ab..83fcd348ddf 100644 --- a/app/assets/javascripts/pages/projects/wikis/index.js +++ b/app/assets/javascripts/pages/projects/wikis/index.js @@ -1,5 +1,3 @@ -import { initDiffStatsDropdown } from '~/init_diff_stats_dropdown'; -import initWikis from '~/pages/shared/wikis'; +import Wikis from '~/pages/shared/wikis/wikis'; -initWikis(); -initDiffStatsDropdown(); +export default new Wikis(); diff --git a/app/assets/javascripts/pages/projects/wikis/show/index.js b/app/assets/javascripts/pages/projects/wikis/show/index.js new file mode 100644 index 00000000000..c08a10122b6 --- /dev/null +++ b/app/assets/javascripts/pages/projects/wikis/show/index.js @@ -0,0 +1,3 @@ +import { mountApplications as mountEditApplications } from '~/pages/shared/wikis/async_edit'; + +mountEditApplications(); diff --git a/app/assets/javascripts/pages/shared/wikis/async_edit.js b/app/assets/javascripts/pages/shared/wikis/async_edit.js new file mode 100644 index 00000000000..4536a076568 --- /dev/null +++ b/app/assets/javascripts/pages/shared/wikis/async_edit.js @@ -0,0 +1,11 @@ +export const mountApplications = async () => { + const el = document.querySelector('.js-wiki-edit-page'); + + if (el) { + const { mountApplications: mountEditApplications } = await import( + /* webpackChunkName: 'wiki_edit' */ './edit' + ); + + mountEditApplications(); + } +}; diff --git a/app/assets/javascripts/pages/shared/wikis/index.js b/app/assets/javascripts/pages/shared/wikis/edit.js index 42aefe81325..beeabfde1a6 100644 --- a/app/assets/javascripts/pages/shared/wikis/index.js +++ b/app/assets/javascripts/pages/shared/wikis/edit.js @@ -1,6 +1,5 @@ import $ from 'jquery'; import Vue from 'vue'; -import ShortcutsWiki from '~/behaviors/shortcuts/shortcuts_wiki'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import csrf from '~/lib/utils/csrf'; import Translate from '~/vue_shared/translate'; @@ -9,14 +8,8 @@ import ZenMode from '../../../zen_mode'; import deleteWikiModal from './components/delete_wiki_modal.vue'; import wikiAlert from './components/wiki_alert.vue'; import wikiForm from './components/wiki_form.vue'; -import Wikis from './wikis'; const createModalVueApp = () => { - new Wikis(); // eslint-disable-line no-new - new ShortcutsWiki(); // eslint-disable-line no-new - new ZenMode(); // eslint-disable-line no-new - new GLForm($('.wiki-form')); // eslint-disable-line no-new - const deleteWikiModalWrapperEl = document.getElementById('delete-wiki-modal-wrapper'); if (deleteWikiModalWrapperEl) { @@ -85,7 +78,10 @@ const createWikiFormApp = () => { } }; -export default () => { +export const mountApplications = () => { + new ZenMode(); // eslint-disable-line no-new + new GLForm($('.wiki-form')); // eslint-disable-line no-new + createModalVueApp(); createAlertVueApp(); createWikiFormApp(); diff --git a/app/assets/javascripts/pages/shared/wikis/wikis.js b/app/assets/javascripts/pages/shared/wikis/wikis.js index 7d0b0c90c8d..8d0105bc681 100644 --- a/app/assets/javascripts/pages/shared/wikis/wikis.js +++ b/app/assets/javascripts/pages/shared/wikis/wikis.js @@ -1,6 +1,7 @@ import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; import Tracking from '~/tracking'; import showToast from '~/vue_shared/plugins/global_toast'; +import ShortcutsWiki from '~/behaviors/shortcuts/shortcuts_wiki'; const TRACKING_EVENT_NAME = 'view_wiki_page'; const TRACKING_CONTEXT_SCHEMA = 'iglu:com.gitlab/wiki_page_context/jsonschema/1-0-1'; @@ -20,6 +21,7 @@ export default class Wikis { Wikis.trackPageView(); Wikis.showToasts(); + Wikis.initShortcuts(); } handleToggleSidebar(e) { @@ -64,4 +66,8 @@ export default class Wikis { const toasts = document.querySelectorAll('.js-toast-message'); toasts.forEach((toast) => showToast(toast.dataset.message)); } + + static initShortcuts() { + new ShortcutsWiki(); // eslint-disable-line no-new + } } diff --git a/app/views/shared/wikis/edit.html.haml b/app/views/shared/wikis/edit.html.haml index 15710f0df49..e0860bc473d 100644 --- a/app/views/shared/wikis/edit.html.haml +++ b/app/views/shared/wikis/edit.html.haml @@ -4,7 +4,7 @@ - if @error #js-wiki-error{ data: { error: @error, wiki_page_path: wiki_page_path(@wiki, @page) } } -.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row +.js-wiki-edit-page.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row = wiki_sidebar_toggle_button %h3.page-title.gl-flex-grow-1 |