diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 13:18:24 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 13:18:24 +0000 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/assets/javascripts/behaviors | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
download | gitlab-ce-0653e08efd039a5905f3fa4f6e9cef9f5d2f799c.tar.gz |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/assets/javascripts/behaviors')
3 files changed, 21 insertions, 23 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/nodes/playable.js b/app/assets/javascripts/behaviors/markdown/nodes/playable.js index 33bb6e0c31c..2b667aba2d6 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/playable.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/playable.js @@ -3,7 +3,6 @@ import { defaultMarkdownSerializer } from 'prosemirror-markdown'; import { Node } from 'tiptap'; -import { HIGHER_PARSE_RULE_PRIORITY } from '../constants'; /** * Abstract base class for playable media, like video and audio. @@ -33,33 +32,33 @@ export default class Playable extends Node { const parseDOM = [ { tag: `.${this.mediaType}-container`, - skip: true, - }, - { - tag: `.${this.mediaType}-container p`, - priority: HIGHER_PARSE_RULE_PRIORITY, - ignore: true, - }, - { - tag: `${this.mediaType}[src]`, - getAttrs: (el) => ({ src: el.src, alt: el.dataset.title }), + getAttrs: (el) => ({ + src: el.querySelector(this.mediaType).src, + alt: el.querySelector(this.mediaType).dataset.title, + }), }, ]; const toDOM = (node) => [ - this.mediaType, - { - src: node.attrs.src, - controls: true, - 'data-setup': '{}', - 'data-title': node.attrs.alt, - ...this.extraElementAttrs, - }, + 'span', + { class: `media-container ${this.mediaType}-container` }, + [ + this.mediaType, + { + src: node.attrs.src, + controls: true, + 'data-setup': '{}', + 'data-title': node.attrs.alt, + ...this.extraElementAttrs, + }, + ], + ['a', { href: node.attrs.src }, node.attrs.alt], ]; return { attrs, - group: 'block', + group: 'inline', + inline: true, draggable: true, parseDOM, toDOM, @@ -68,6 +67,5 @@ export default class Playable extends Node { toMarkdown(state, node) { defaultMarkdownSerializer.nodes.image(state, node); - state.closeBlock(node); } } diff --git a/app/assets/javascripts/behaviors/shortcuts/keybindings.js b/app/assets/javascripts/behaviors/shortcuts/keybindings.js index 005ef103ded..ebf2ab0381e 100644 --- a/app/assets/javascripts/behaviors/shortcuts/keybindings.js +++ b/app/assets/javascripts/behaviors/shortcuts/keybindings.js @@ -19,7 +19,7 @@ export const LOCAL_STORAGE_KEY = 'gl-keyboard-shortcuts-customizations'; */ export const getCustomizations = memoize(() => { let parsedCustomizations = {}; - const localStorageIsSafe = AccessorUtilities.isLocalStorageAccessSafe(); + const localStorageIsSafe = AccessorUtilities.canUseLocalStorage(); if (localStorageIsSafe) { try { diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_toggle.vue b/app/assets/javascripts/behaviors/shortcuts/shortcuts_toggle.vue index 8f1518a1c9c..cf7a71d4206 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_toggle.vue +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_toggle.vue @@ -13,7 +13,7 @@ export default { }, data() { return { - localStorageUsable: AccessorUtilities.isLocalStorageAccessSafe(), + localStorageUsable: AccessorUtilities.canUseLocalStorage(), shortcutsEnabled: !shouldDisableShortcuts(), }; }, |