Skip to content

Commit

Permalink
Improve atom demos
Browse files Browse the repository at this point in the history
* Update mentionAtom mobiledoc with more atoms
* Add image-atom with inline image
* Fix demo mobiledoc for input-card
* Update renderers, add html image-atom
  • Loading branch information
bantic committed Feb 4, 2016
1 parent b5957a6 commit bc3fa94
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 9 deletions.
2 changes: 1 addition & 1 deletion demo/app/controllers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let { $ } = Ember;
export default Ember.Controller.extend({
init() {
this._super.apply(this, arguments);
let mobiledoc = mobiledocs['simple'];
let mobiledoc = mobiledocs['mentionAtom'];
this.set('mobiledoc', mobiledoc);
this.set('editedMobiledoc', mobiledoc);
this.set('rendererName', 'dom');
Expand Down
4 changes: 3 additions & 1 deletion demo/app/mobiledoc-atoms/dom.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import mentionAtom from './dom/mention';
import imageAtom from './dom/image';

export default [
mentionAtom
mentionAtom,
imageAtom
];
10 changes: 10 additions & 0 deletions demo/app/mobiledoc-atoms/dom/image.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export default {
name: 'image-atom',
type: 'dom',
render() {
const element = document.createElement("img");
element.style.display = 'inline';
element.src = 'http://placehold.it/30x20';
return element;
}
};
4 changes: 3 additions & 1 deletion demo/app/mobiledoc-atoms/html.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import mentionAtom from './html/mention';
import imageAtom from './html/image';

export default [
mentionAtom
mentionAtom,
imageAtom
];
7 changes: 7 additions & 0 deletions demo/app/mobiledoc-atoms/html/image.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export default {
name: 'image-atom',
type: 'html',
render({value}) {
return `<img src="${value}">`;
}
};
30 changes: 27 additions & 3 deletions demo/app/mobiledocs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@ export default {
mentionAtom: {
version: '0.3.0',
atoms: [
['mention-atom', 'Bob', {}]
['mention-atom', 'Bob', {}],
['mention-atom', 'Bob', {}],
['mention-atom', 'Bob', {}],
['mention-atom', 'Bob', {}],
['mention-atom', 'Bob', {}],
['mention-atom', 'Bob', {}],
['mention-atom', 'Bob', {}],
['image-atom', 'n/a', {}]
],
markups: [],
cards: [],
Expand All @@ -13,7 +20,24 @@ export default {
[1, 'P', [
[0, [], 0, 'Text before the atom. '],
[1, [], 0, 0],
[0, [], 0, ' Text after the atom.']
[0, [], 0, ' Text after the atom, before image: '],
[1, [], 0, 7],
[0, [], 0, ' text after the image atom']
]],
[1, 'P', [
[1, [], 0, 1],
[0, [], 0, ' atom at start']
]],
[1, 'P', [
[0, [], 0, 'atom at end '],
[1, [], 0, 2]
]],
[1, 'P', [
[1, [], 0, 3],
[1, [], 0, 4],
[0, [], 0, ' multiple atoms at start and end '],
[1, [], 0, 5],
[1, [], 0, 6]
]]
]
},
Expand Down Expand Up @@ -49,7 +73,7 @@ export default {
],
sections: [
[1, 'H2', [
[[], 0, 'Input Card']
[0, [], 0, 'Input Card']
]],
[10, 0],
[1, 'P', [
Expand Down
6 changes: 3 additions & 3 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"ember-mobiledoc-editor": "0.3.2-beta.5",
"ember-disable-proxy-controllers": "^1.0.0",
"ember-export-application-global": "^1.0.3",
"ember-mobiledoc-dom-renderer": "^0.2.1",
"ember-mobiledoc-html-renderer": "^0.2.0",
"ember-mobiledoc-text-renderer": "^0.2.0"
"ember-mobiledoc-dom-renderer": "^0.3.0-beta.1",
"ember-mobiledoc-html-renderer": "^0.3.0-beta.1",
"ember-mobiledoc-text-renderer": "^0.3.0-beta.1"
}
}

0 comments on commit bc3fa94

Please sign in to comment.