Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

If this card is the last element in the document create an empty paragraph afterwards.

Browse source
This commit is contained in:
Ryan McCarvill 2017-04-05 23:32:39 +12:00 • committed by Kevin Ansfield
parent 30429c7249
commit 7e1c829df6
1 changed files with 33 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
ghost/admin/lib/gh-koenig/addon/options/default-tools.js
View file

@ -199,14 +199,18 @@ export default function (editor, toolbar) {
cardMenu: true, cardMenu: true,
onClick: (editor) => { onClick: (editor) => {
editor.run((postEditor, section) => { editor.run((postEditor, section) => {
let thisSection = section || editor.range.headSection;
let card = postEditor.builder.createCardSection('card-image', {pos: 'top'}); let card = postEditor.builder.createCardSection('card-image', {pos: 'top'});
console.log(editor.range.headSection.text.length); if (thisSection.text.length) {
if (section || editor.range.headSection.text.length) {
postEditor.insertSection(card); postEditor.insertSection(card);
} else { } else {
postEditor.replaceSection(section || editor.range.headSection, card); postEditor.replaceSection(thisSection, card);
}
// insert empty paragraph after card if it's the last element.
if(!thisSection.next) {
let newSection = editor.builder.createMarkupSection('p');
postEditor.insertSectionAtEnd(newSection);
} }
}); });
}, },
checkElements(elements) { checkElements(elements) {
@ -224,15 +228,18 @@ export default function (editor, toolbar) {
cardMenu: true, cardMenu: true,
onClick: (editor, section) => { onClick: (editor, section) => {
editor.run((postEditor) => { editor.run((postEditor) => {
let card = postEditor.builder.createCardSection('card-html', {pos: 'top', html: editor.range.headSection.text}); let thisSection = section || editor.range.headSection;
let card = postEditor.builder.createCardSection('card-html', {pos: 'top', html: thisSection.text});
// we can't replace a list item so we insert a card after it and then delete it. // we can't replace a list item so we insert a card after it and then delete it.
if (editor.range.headSection.isListItem) { if (thisSection.isListItem) {
// postEditor.toggleSection('p');
// postEditor.insertSection(card);
// postEditor.removeSection(editor.range.head.section);
editor.insertCard('card-html'); editor.insertCard('card-html');
} else { } else {
postEditor.replaceSection(section || editor.range.headSection, card); postEditor.replaceSection(thisSection, card);
}
if(!thisSection.next) {
let newSection = editor.builder.createMarkupSection('p');
postEditor.insertSectionAtEnd(newSection);
} }
}); });
}, },
@ -249,10 +256,16 @@ export default function (editor, toolbar) {
visibility: 'primary', visibility: 'primary',
order: 4, order: 4,
cardMenu: true, cardMenu: true,
onClick: (editor) => { onClick: (editor, section) => {
editor.run((postEditor) => { editor.run((postEditor) => {
let thisSection = section || editor.range.headSection;
let card = postEditor.builder.createCardSection('card-hr', {pos: 'top'}); let card = postEditor.builder.createCardSection('card-hr', {pos: 'top'});
postEditor.insertSection(card); postEditor.insertSection(card);
if(!thisSection.next) {
let newSection = editor.builder.createMarkupSection('p');
postEditor.insertSectionAtEnd(newSection);
}
}); });
}, },
checkElements() { checkElements() {
@ -269,12 +282,18 @@ export default function (editor, toolbar) {
cardMenu: true, cardMenu: true,
onClick: (editor, section) => { onClick: (editor, section) => {
editor.run((postEditor) => { editor.run((postEditor) => {
let card = postEditor.builder.createCardSection('card-markdown', {pos: 'top', markdown: editor.range.headSection.text, newlyCreated: true}); let thisSection = section || editor.range.headSection;
let card = postEditor.builder.createCardSection('card-markdown', {pos: 'top', markdown: thisSection.text, newlyCreated: true});
// we can't replace a list item so we insert a card after it and then delete it. // we can't replace a list item so we insert a card after it and then delete it.
if (editor.range.headSection.isListItem) { if (thisSection.isListItem) {
editor.insertCard('card-markdown'); editor.insertCard('card-markdown');
} else { } else {
postEditor.replaceSection(section || editor.range.headSection, card); postEditor.replaceSection(thisSection, card);
}
// if this is the last element then insert a paragraph after the card
if(!thisSection.next) {
let newSection = editor.builder.createMarkupSection('p');
postEditor.insertSectionAtEnd(newSection);
} }
}); });
}, },