Skip to content

Commit

Permalink
use isBlank in editor-dom renderer
Browse files Browse the repository at this point in the history
  • Loading branch information
bantic committed Sep 15, 2015
1 parent 5d3c092 commit 542e672
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
1 change: 0 additions & 1 deletion src/js/models/list-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ export default class ListItem extends Markerable {
return item;
}
}

29 changes: 15 additions & 14 deletions src/js/renderers/editor-dom.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ function renderListItem() {
return document.createElement('li');
}

function renderCursorPlaceholder() {
return document.createElement('br');
}

function renderCard() {
const element = document.createElement('div');
element.contentEditable = false;
Expand Down Expand Up @@ -146,7 +150,7 @@ class Visitor {

[POST_TYPE](renderNode, post, visit) {
if (!renderNode.element) {
let element = document.createElement('div');
const element = document.createElement('div');
renderNode.element = element;
}
visit(renderNode, post.sections);
Expand All @@ -157,19 +161,17 @@ class Visitor {

// Always rerender the section -- its tag name or attributes may have changed.
// TODO make this smarter, only rerendering and replacing the element when necessary
let element = renderMarkupSection(section);
const element = renderMarkupSection(section);
renderNode.element = element;

attachRenderNodeElementToDOM(renderNode, element, originalElement);
renderNode.renderTree.elements.set(element, renderNode);

if (section.markers.length) {
if (section.isBlank) {
renderNode.element.appendChild(renderCursorPlaceholder());
} else {
const visitAll = true;
visit(renderNode, section.markers, visitAll);
} else {
renderNode.renderTree.elements.set(renderNode.element, renderNode);
let br = document.createElement('br');
renderNode.element.appendChild(br);
}
}

Expand All @@ -192,13 +194,11 @@ class Visitor {
attachRenderNodeElementToDOM(renderNode, element, null);
renderNode.renderTree.elements.set(element, renderNode);

if (item.markers.length) {
if (item.isBlank) {
renderNode.element.appendChild(renderCursorPlaceholder());
} else {
const visitAll = true;
visit(renderNode, item.markers, visitAll);
} else {
renderNode.renderTree.elements.set(renderNode.element, renderNode);
let br = document.createElement('br');
renderNode.element.appendChild(br);
}
}

Expand All @@ -212,8 +212,9 @@ class Visitor {
}

const element = renderMarker(marker, parentElement, renderNode.prev);
renderNode.renderTree.elements.set(element, renderNode);
renderNode.element = element;

renderNode.renderTree.elements.set(element, renderNode);
}

[IMAGE_SECTION_TYPE](renderNode, section) {
Expand Down Expand Up @@ -246,8 +247,8 @@ class Visitor {
renderNode.element = element;

attachRenderNodeElementToDOM(renderNode, element, originalElement);

renderNode.renderTree.elements.set(element, renderNode);

if (card) {
const cardNode = new CardNode(editor, card, section, element, options);
renderNode.cardNode = cardNode;
Expand Down

0 comments on commit 542e672

Please sign in to comment.