diff options
Diffstat (limited to 'app/assets/javascripts/behaviors/markdown')
20 files changed, 48 insertions, 55 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/editor_extensions.js b/app/assets/javascripts/behaviors/markdown/editor_extensions.js index 308e31e7047..b512e4dbc8b 100644 --- a/app/assets/javascripts/behaviors/markdown/editor_extensions.js +++ b/app/assets/javascripts/behaviors/markdown/editor_extensions.js @@ -1,52 +1,45 @@ -import Doc from './nodes/doc'; -import Paragraph from './nodes/paragraph'; -import Text from './nodes/text'; - +import Bold from './marks/bold'; +import Code from './marks/code'; +import InlineDiff from './marks/inline_diff'; +import InlineHTML from './marks/inline_html'; +import Italic from './marks/italic'; +import Link from './marks/link'; +import MathMark from './marks/math'; +import Strike from './marks/strike'; +import Audio from './nodes/audio'; import Blockquote from './nodes/blockquote'; +import BulletList from './nodes/bullet_list'; import CodeBlock from './nodes/code_block'; +import DescriptionDetails from './nodes/description_details'; +import DescriptionList from './nodes/description_list'; +import DescriptionTerm from './nodes/description_term'; +import Details from './nodes/details'; +import Doc from './nodes/doc'; + +import Emoji from './nodes/emoji'; import HardBreak from './nodes/hard_break'; import Heading from './nodes/heading'; import HorizontalRule from './nodes/horizontal_rule'; import Image from './nodes/image'; +import ListItem from './nodes/list_item'; +import OrderedList from './nodes/ordered_list'; +import OrderedTaskList from './nodes/ordered_task_list'; +import Paragraph from './nodes/paragraph'; +import Reference from './nodes/reference'; +import Summary from './nodes/summary'; import Table from './nodes/table'; -import TableHead from './nodes/table_head'; import TableBody from './nodes/table_body'; -import TableHeaderRow from './nodes/table_header_row'; -import TableRow from './nodes/table_row'; import TableCell from './nodes/table_cell'; - -import Emoji from './nodes/emoji'; -import Reference from './nodes/reference'; - +import TableHead from './nodes/table_head'; +import TableHeaderRow from './nodes/table_header_row'; import TableOfContents from './nodes/table_of_contents'; -import Video from './nodes/video'; -import Audio from './nodes/audio'; - -import BulletList from './nodes/bullet_list'; -import OrderedList from './nodes/ordered_list'; -import ListItem from './nodes/list_item'; - -import DescriptionList from './nodes/description_list'; -import DescriptionTerm from './nodes/description_term'; -import DescriptionDetails from './nodes/description_details'; +import TableRow from './nodes/table_row'; import TaskList from './nodes/task_list'; -import OrderedTaskList from './nodes/ordered_task_list'; import TaskListItem from './nodes/task_list_item'; - -import Summary from './nodes/summary'; -import Details from './nodes/details'; - -import Bold from './marks/bold'; -import Italic from './marks/italic'; -import Strike from './marks/strike'; -import InlineDiff from './marks/inline_diff'; - -import Link from './marks/link'; -import Code from './marks/code'; -import MathMark from './marks/math'; -import InlineHTML from './marks/inline_html'; +import Text from './nodes/text'; +import Video from './nodes/video'; // The filters referenced in lib/banzai/pipeline/gfm_pipeline.rb transform // GitLab Flavored Markdown (GFM) to HTML. diff --git a/app/assets/javascripts/behaviors/markdown/marks/bold.js b/app/assets/javascripts/behaviors/markdown/marks/bold.js index b537954c1cb..d307edd9fd3 100644 --- a/app/assets/javascripts/behaviors/markdown/marks/bold.js +++ b/app/assets/javascripts/behaviors/markdown/marks/bold.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Bold as BaseBold } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Bold as BaseBold } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Bold extends BaseBold { diff --git a/app/assets/javascripts/behaviors/markdown/marks/code.js b/app/assets/javascripts/behaviors/markdown/marks/code.js index a760ee80dd0..ccfe2cf5b8d 100644 --- a/app/assets/javascripts/behaviors/markdown/marks/code.js +++ b/app/assets/javascripts/behaviors/markdown/marks/code.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Code as BaseCode } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Code as BaseCode } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Code extends BaseCode { diff --git a/app/assets/javascripts/behaviors/markdown/marks/inline_html.js b/app/assets/javascripts/behaviors/markdown/marks/inline_html.js index 556e6f7df1c..e957f81b774 100644 --- a/app/assets/javascripts/behaviors/markdown/marks/inline_html.js +++ b/app/assets/javascripts/behaviors/markdown/marks/inline_html.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Mark } from 'tiptap'; import { escape } from 'lodash'; +import { Mark } from 'tiptap'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class InlineHTML extends Mark { diff --git a/app/assets/javascripts/behaviors/markdown/marks/italic.js b/app/assets/javascripts/behaviors/markdown/marks/italic.js index 44b35c97739..dbef10536ab 100644 --- a/app/assets/javascripts/behaviors/markdown/marks/italic.js +++ b/app/assets/javascripts/behaviors/markdown/marks/italic.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Italic as BaseItalic } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Italic as BaseItalic } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Italic extends BaseItalic { diff --git a/app/assets/javascripts/behaviors/markdown/marks/link.js b/app/assets/javascripts/behaviors/markdown/marks/link.js index 5c23d6a5ceb..1111c51805d 100644 --- a/app/assets/javascripts/behaviors/markdown/marks/link.js +++ b/app/assets/javascripts/behaviors/markdown/marks/link.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Link as BaseLink } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Link as BaseLink } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Link extends BaseLink { diff --git a/app/assets/javascripts/behaviors/markdown/marks/math.js b/app/assets/javascripts/behaviors/markdown/marks/math.js index 04441d5d710..382bf5c9b5b 100644 --- a/app/assets/javascripts/behaviors/markdown/marks/math.js +++ b/app/assets/javascripts/behaviors/markdown/marks/math.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Mark } from 'tiptap'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Mark } from 'tiptap'; import { HIGHER_PARSE_RULE_PRIORITY } from '../constants'; // Transforms generated HTML back to GFM for Banzai::Filter::MathFilter diff --git a/app/assets/javascripts/behaviors/markdown/nodes/blockquote.js b/app/assets/javascripts/behaviors/markdown/nodes/blockquote.js index b0bc8f79643..bd5868e5524 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/blockquote.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/blockquote.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Blockquote as BaseBlockquote } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Blockquote as BaseBlockquote } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Blockquote extends BaseBlockquote { diff --git a/app/assets/javascripts/behaviors/markdown/nodes/bullet_list.js b/app/assets/javascripts/behaviors/markdown/nodes/bullet_list.js index 3b0792e1af8..209e7239998 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/bullet_list.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/bullet_list.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { BulletList as BaseBulletList } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { BulletList as BaseBulletList } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class BulletList extends BaseBulletList { diff --git a/app/assets/javascripts/behaviors/markdown/nodes/heading.js b/app/assets/javascripts/behaviors/markdown/nodes/heading.js index fec8608cf5d..708da053a2f 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/heading.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/heading.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Heading as BaseHeading } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Heading as BaseHeading } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Heading extends BaseHeading { diff --git a/app/assets/javascripts/behaviors/markdown/nodes/horizontal_rule.js b/app/assets/javascripts/behaviors/markdown/nodes/horizontal_rule.js index 695c7160bde..47a24eae1e8 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/horizontal_rule.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/horizontal_rule.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { HorizontalRule as BaseHorizontalRule } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { HorizontalRule as BaseHorizontalRule } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class HorizontalRule extends BaseHorizontalRule { diff --git a/app/assets/javascripts/behaviors/markdown/nodes/image.js b/app/assets/javascripts/behaviors/markdown/nodes/image.js index 76746528e72..ade5839d10b 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/image.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/image.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Image as BaseImage } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Image as BaseImage } from 'tiptap-extensions'; import { placeholderImage } from '~/lazy_loader'; import { HIGHER_PARSE_RULE_PRIORITY } from '../constants'; diff --git a/app/assets/javascripts/behaviors/markdown/nodes/list_item.js b/app/assets/javascripts/behaviors/markdown/nodes/list_item.js index 4237637ed9a..0f56e89dca6 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/list_item.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/list_item.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { ListItem as BaseListItem } from 'tiptap-extensions'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { ListItem as BaseListItem } from 'tiptap-extensions'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class ListItem extends BaseListItem { diff --git a/app/assets/javascripts/behaviors/markdown/nodes/paragraph.js b/app/assets/javascripts/behaviors/markdown/nodes/paragraph.js index dec3207b1bb..93d00f27868 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/paragraph.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/paragraph.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Node } from 'tiptap'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Node } from 'tiptap'; // Transforms generated HTML back to GFM for Banzai::Filter::MarkdownFilter export default class Paragraph extends Node { diff --git a/app/assets/javascripts/behaviors/markdown/nodes/playable.js b/app/assets/javascripts/behaviors/markdown/nodes/playable.js index 9cbd95a7bd8..33bb6e0c31c 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/playable.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/playable.js @@ -1,8 +1,8 @@ /* eslint-disable class-methods-use-this */ /* eslint-disable @gitlab/require-i18n-strings */ -import { Node } from 'tiptap'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Node } from 'tiptap'; import { HIGHER_PARSE_RULE_PRIORITY } from '../constants'; /** diff --git a/app/assets/javascripts/behaviors/markdown/nodes/table_header_row.js b/app/assets/javascripts/behaviors/markdown/nodes/table_header_row.js index 6e3c16f0a08..2cb2bb9e7fe 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/table_header_row.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/table_header_row.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import TableRow from './table_row'; import { HIGHER_PARSE_RULE_PRIORITY } from '../constants'; +import TableRow from './table_row'; const CENTER_ALIGN = 'center'; diff --git a/app/assets/javascripts/behaviors/markdown/nodes/text.js b/app/assets/javascripts/behaviors/markdown/nodes/text.js index 84838c14999..4eab10c9d98 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/text.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/text.js @@ -1,7 +1,7 @@ /* eslint-disable class-methods-use-this */ -import { Node } from 'tiptap'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; +import { Node } from 'tiptap'; export default class Text extends Node { get name() { diff --git a/app/assets/javascripts/behaviors/markdown/render_gfm.js b/app/assets/javascripts/behaviors/markdown/render_gfm.js index 5e9d80e1529..7934eac2f7e 100644 --- a/app/assets/javascripts/behaviors/markdown/render_gfm.js +++ b/app/assets/javascripts/behaviors/markdown/render_gfm.js @@ -1,10 +1,10 @@ import $ from 'jquery'; import syntaxHighlight from '~/syntax_highlight'; +import initUserPopovers from '../../user_popovers'; +import highlightCurrentUser from './highlight_current_user'; import renderMath from './render_math'; import renderMermaid from './render_mermaid'; import renderMetrics from './render_metrics'; -import highlightCurrentUser from './highlight_current_user'; -import initUserPopovers from '../../user_popovers'; // Render GitLab flavoured Markdown // diff --git a/app/assets/javascripts/behaviors/markdown/render_math.js b/app/assets/javascripts/behaviors/markdown/render_math.js index f34fec4d449..5479866c99a 100644 --- a/app/assets/javascripts/behaviors/markdown/render_math.js +++ b/app/assets/javascripts/behaviors/markdown/render_math.js @@ -1,6 +1,6 @@ import { deprecatedCreateFlash as flash } from '~/flash'; -import { s__, sprintf } from '~/locale'; import { differenceInMilliseconds } from '~/lib/utils/datetime_utility'; +import { s__, sprintf } from '~/locale'; // Renders math using KaTeX in any element with the // `js-render-math` class diff --git a/app/assets/javascripts/behaviors/markdown/render_mermaid.js b/app/assets/javascripts/behaviors/markdown/render_mermaid.js index 479782a1f1f..0cb13815c7e 100644 --- a/app/assets/javascripts/behaviors/markdown/render_mermaid.js +++ b/app/assets/javascripts/behaviors/markdown/render_mermaid.js @@ -140,7 +140,7 @@ function renderMermaids($els) { 'Warning: Displaying this diagram might cause performance issues on this page.', )}</div> <div class="gl-alert-actions"> - <button class="js-lazy-render-mermaid btn gl-alert-action btn-warning btn-md new-gl-button">Display</button> + <button class="js-lazy-render-mermaid btn gl-alert-action btn-warning btn-md gl-button">Display</button> </div> </div> <button type="button" class="close" data-dismiss="alert" aria-label="Close"> |