Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add latest changes from gitlab-org/gitlab@master
- Loading branch information
GitLab Bot
committed
Dec 6, 2021
1 parent
7c31b03
commit 5524283
Showing
48 changed files
with
1,198 additions
and
817 deletions.
There are no files selected for viewing
155 changes: 2 additions & 153 deletions
155
app/assets/javascripts/editor/extensions/source_editor_markdown_ext.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
154 changes: 154 additions & 0 deletions
154
app/assets/javascripts/editor/extensions/source_editor_markdown_livepreview_ext.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| import { debounce } from 'lodash'; | ||
| import { BLOB_PREVIEW_ERROR } from '~/blob_edit/constants'; | ||
| import createFlash from '~/flash'; | ||
| import { sanitize } from '~/lib/dompurify'; | ||
| import axios from '~/lib/utils/axios_utils'; | ||
| import { __ } from '~/locale'; | ||
| import syntaxHighlight from '~/syntax_highlight'; | ||
| import { | ||
| EXTENSION_MARKDOWN_PREVIEW_PANEL_CLASS, | ||
| EXTENSION_MARKDOWN_PREVIEW_ACTION_ID, | ||
| EXTENSION_MARKDOWN_PREVIEW_PANEL_WIDTH, | ||
| EXTENSION_MARKDOWN_PREVIEW_PANEL_PARENT_CLASS, | ||
| EXTENSION_MARKDOWN_PREVIEW_UPDATE_DELAY, | ||
| } from '../constants'; | ||
| import { SourceEditorExtension } from './source_editor_extension_base'; | ||
|
|
||
| const getPreview = (text, previewMarkdownPath) => { | ||
| return axios | ||
| .post(previewMarkdownPath, { | ||
| text, | ||
| }) | ||
| .then(({ data }) => { | ||
| return data.body; | ||
| }); | ||
| }; | ||
|
|
||
| const setupDomElement = ({ injectToEl = null } = {}) => { | ||
| const previewEl = document.createElement('div'); | ||
| previewEl.classList.add(EXTENSION_MARKDOWN_PREVIEW_PANEL_CLASS); | ||
| previewEl.style.display = 'none'; | ||
| if (injectToEl) { | ||
| injectToEl.appendChild(previewEl); | ||
| } | ||
| return previewEl; | ||
| }; | ||
|
|
||
| export class EditorMarkdownPreviewExtension extends SourceEditorExtension { | ||
| constructor({ instance, previewMarkdownPath, ...args } = {}) { | ||
| super({ instance, ...args }); | ||
| Object.assign(instance, { | ||
| previewMarkdownPath, | ||
| preview: { | ||
| el: undefined, | ||
| action: undefined, | ||
| shown: false, | ||
| modelChangeListener: undefined, | ||
| }, | ||
| }); | ||
| this.setupPreviewAction.call(instance); | ||
|
|
||
| instance.getModel().onDidChangeLanguage(({ newLanguage, oldLanguage } = {}) => { | ||
| if (newLanguage === 'markdown' && oldLanguage !== newLanguage) { | ||
| instance.setupPreviewAction(); | ||
| } else { | ||
| instance.cleanup(); | ||
| } | ||
| }); | ||
|
|
||
| instance.onDidChangeModel(() => { | ||
| const model = instance.getModel(); | ||
| if (model) { | ||
| const { language } = model.getLanguageIdentifier(); | ||
| instance.cleanup(); | ||
| if (language === 'markdown') { | ||
| instance.setupPreviewAction(); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| static togglePreviewLayout() { | ||
| const { width, height } = this.getLayoutInfo(); | ||
| const newWidth = this.preview.shown | ||
| ? width / EXTENSION_MARKDOWN_PREVIEW_PANEL_WIDTH | ||
| : width * EXTENSION_MARKDOWN_PREVIEW_PANEL_WIDTH; | ||
| this.layout({ width: newWidth, height }); | ||
| } | ||
|
|
||
| static togglePreviewPanel() { | ||
| const parentEl = this.getDomNode().parentElement; | ||
| const { el: previewEl } = this.preview; | ||
| parentEl.classList.toggle(EXTENSION_MARKDOWN_PREVIEW_PANEL_PARENT_CLASS); | ||
|
|
||
| if (previewEl.style.display === 'none') { | ||
| // Show the preview panel | ||
| this.fetchPreview(); | ||
| } else { | ||
| // Hide the preview panel | ||
| previewEl.style.display = 'none'; | ||
| } | ||
| } | ||
|
|
||
| cleanup() { | ||
| if (this.preview.modelChangeListener) { | ||
| this.preview.modelChangeListener.dispose(); | ||
| } | ||
| this.preview.action.dispose(); | ||
| if (this.preview.shown) { | ||
| EditorMarkdownPreviewExtension.togglePreviewPanel.call(this); | ||
| EditorMarkdownPreviewExtension.togglePreviewLayout.call(this); | ||
| } | ||
| this.preview.shown = false; | ||
| } | ||
|
|
||
| fetchPreview() { | ||
| const { el: previewEl } = this.preview; | ||
| getPreview(this.getValue(), this.previewMarkdownPath) | ||
| .then((data) => { | ||
| previewEl.innerHTML = sanitize(data); | ||
| syntaxHighlight(previewEl.querySelectorAll('.js-syntax-highlight')); | ||
| previewEl.style.display = 'block'; | ||
| }) | ||
| .catch(() => createFlash(BLOB_PREVIEW_ERROR)); | ||
| } | ||
|
|
||
| setupPreviewAction() { | ||
| if (this.getAction(EXTENSION_MARKDOWN_PREVIEW_ACTION_ID)) return; | ||
|
|
||
| this.preview.action = this.addAction({ | ||
| id: EXTENSION_MARKDOWN_PREVIEW_ACTION_ID, | ||
| label: __('Preview Markdown'), | ||
| keybindings: [ | ||
| // eslint-disable-next-line no-bitwise,no-undef | ||
| monaco.KeyMod.chord(monaco.KeyMod.CtrlCmd | monaco.KeyMod.Shift | monaco.KeyCode.KEY_P), | ||
| ], | ||
| contextMenuGroupId: 'navigation', | ||
| contextMenuOrder: 1.5, | ||
|
|
||
| // Method that will be executed when the action is triggered. | ||
| // @param ed The editor instance is passed in as a convenience | ||
| run(instance) { | ||
| instance.togglePreview(); | ||
| }, | ||
| }); | ||
| } | ||
|
|
||
| togglePreview() { | ||
| if (!this.preview?.el) { | ||
| this.preview.el = setupDomElement({ injectToEl: this.getDomNode().parentElement }); | ||
| } | ||
| EditorMarkdownPreviewExtension.togglePreviewLayout.call(this); | ||
| EditorMarkdownPreviewExtension.togglePreviewPanel.call(this); | ||
|
|
||
| if (!this.preview?.shown) { | ||
| this.preview.modelChangeListener = this.onDidChangeModelContent( | ||
| debounce(this.fetchPreview.bind(this), EXTENSION_MARKDOWN_PREVIEW_UPDATE_DELAY), | ||
| ); | ||
| } else { | ||
| this.preview.modelChangeListener.dispose(); | ||
| } | ||
|
|
||
| this.preview.shown = !this.preview?.shown; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,3 +60,5 @@ def assign_dir_vars | |
| } | ||
| end | ||
| end | ||
|
|
||
| Projects::TreeController.prepend_mod | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.