Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore mutation events from within atoms #362

Merged
merged 1 commit into from
Apr 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/js/editor/mutation-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,15 @@ export default class MutationHandler {

for (let j=0; j < nodes.length; j++) {
let node = nodes[j];
let renderNode = this._findSectionRenderNodeFromNode(node);
let renderNode = this._findRenderNodeFromNode(node);
if (renderNode) {
if (renderNode.reparsesMutationOfChildNode(node)) {
sections.add(renderNode.postNode);
let section = this._findSectionFromRenderNode(renderNode);
if (section) {
sections.add(section);
} else {
reparsePost = true;
}
}
} else {
reparsePost = true;
Expand Down Expand Up @@ -140,4 +145,13 @@ export default class MutationHandler {
});
}

_findRenderNodeFromNode(node) {
return this.renderTree.findRenderNodeFromElement(node);
}

_findSectionFromRenderNode(renderNode) {
let sectionRenderNode = this._findSectionRenderNodeFromNode(renderNode.element);
return sectionRenderNode && sectionRenderNode.postNode;
}

}
2 changes: 2 additions & 0 deletions src/js/models/render-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ export default class RenderNode extends LinkedItem {
reparsesMutationOfChildNode(node) {
if (this.postNode.isCardSection) {
return !containsNode(this.cardNode.element, node);
} else if (this.postNode.isAtom) {
return !containsNode(this.atomNode.element, node);
}
return true;
}
Expand Down
33 changes: 33 additions & 0 deletions tests/unit/editor/atom-lifecycle-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -234,3 +234,36 @@ test('onTeardown hook is called when editor is destroyed', (assert) => {

assert.ok(teardown, 'onTeardown hook called');
});

test('mutating the content of an atom does not trigger an update', (assert) => {
const done = assert.async();

const atomName = 'test-atom';

const atom = {
name: atomName,
type: 'dom',
render() {
return makeEl('the-atom');
}
};

const mobiledoc = build(({markupSection, post, atom}) =>
post([markupSection('p', [atom(atomName, '@bob', {})])])
);
editor = new Editor({mobiledoc, atoms: [atom]});

let updateTriggered = false;
editor.postDidChange(() => updateTriggered = true);

assert.hasNoElement('#editor #the-atom', 'precond - atom not rendered');
editor.render(editorElement);

$("#the-atom").html("updated");

// ensure the mutations have had time to trigger
setTimeout(function(){
assert.ok(!updateTriggered);
done();
}, 10);
});