ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2242 from Human-Connection/fix-1937

Browse Source 
fix(editor): Fix hashtags not working after embeded content
This commit is contained in:
Robert Schäfer 2019-11-15 15:50:11 +01:00 committed by GitHub
commit fd4fee9aee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
webapp/components/Editor/defaultExtensions.spec.js
View File

@ -63,30 +63,26 @@ describe('defaultExtensions', () => {
it('recognizes embed code', () => {
const editor = createEditor()
const expected = {
type: 'doc',
content: [
{
type: 'paragraph',
content: [
{
text: 'Baby loves cat:',
type: 'text',
},
],
type: 'paragraph',
},
{
content: [
{
attrs: {
dataEmbedUrl: 'https://www.youtube.com/watch?v=qkdXAtO40Fo',
},
type: 'embed',
},
],
type: 'paragraph',
type: 'embed',
attrs: {
dataEmbedUrl: 'https://www.youtube.com/watch?v=qkdXAtO40Fo',
},
},
],
type: 'doc',
}
expect(editor.getJSON()).toEqual(expected)
})
})

4
webapp/components/Editor/nodes/Embed.js
View File

@ -38,8 +38,8 @@ export default class Embed extends Node {
default: null,
},
},
group: 'inline',
inline: true,
group: 'block',
inline: false,
parseDOM: [
{
tag: 'a[href].embed',