Skip to content

Commit

Permalink
Only reference runtime in demo
Browse files Browse the repository at this point in the history
  • Loading branch information
mixonic committed Jul 9, 2015
1 parent 433947d commit 1926c95
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 22 deletions.
3 changes: 1 addition & 2 deletions Brocfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ var demo = require('./broccoli/demo');
var jquery = require('./broccoli/jquery');

var vendoredModules = [
{name: 'content-kit-utils', options: {libDirName: 'src'}},
{name: 'mobiledoc-dom-renderer'}
{name: 'content-kit-utils', options: {libDirName: 'src'}}
];
var packageName = require('./package.json').name;

Expand Down
33 changes: 24 additions & 9 deletions broccoli/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,31 @@
'use strict';

var funnel = require('broccoli-funnel');
var mergeTrees = require('broccoli-merge-trees');
var path = require('path');

module.exports = function() {
var demoDir = 'demo';
return funnel(demoDir, {
include: [
'**/*.css',
'**/*.js',
'favicon.ico',
'**/*.html'
],
destDir: '/demo'
});
var rendererDir = path.join(
path.dirname(
require.resolve('mobiledoc-dom-renderer')
)
);
return mergeTrees([
funnel(demoDir, {
include: [
'**/*.css',
'**/*.js',
'favicon.ico',
'**/*.html'
],
destDir: '/demo'
}),
funnel(rendererDir, {
include: [
'mobiledoc-dom-renderer.js'
],
destDir: '/demo'
})
]);
};
2 changes: 1 addition & 1 deletion demo/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var ContentKitDemo = exports.ContentKitDemo = {
var json = editor.serialize();
codePaneJSON.innerHTML = this.syntaxHighlight(json);

var renderer = new ContentKit.Runtime.DOMRenderer();
var renderer = new MobiledocDOMRenderer();
var rendered = renderer.render(json);

$('#rendered-mobiledoc').empty();
Expand Down
1 change: 1 addition & 0 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ <h2>rendered mobiledoc</h2>
<!-- Include ContentKit JS -->
<script src="../global/content-kit-editor.js"></script>
<!-- JS just for the demo page -->
<script src="./mobiledoc-dom-renderer.js"></script>
<script src="./jquery/jquery.js"></script>
<script src="demo.js"></script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"gulp-qunit": "^1.2.1",
"gulp-uglify": "^1.1.0",
"jquery": "^2.1.4",
"mobiledoc-dom-renderer": "^0.1.2",
"mobiledoc-dom-renderer": "^0.1.3",
"testem": "^0.8.4"
}
}
7 changes: 1 addition & 6 deletions src/js/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import Editor from './editor/editor';
import DOMRenderer from './runtime/renderers/mobiledoc-dom';

const Runtime = {
DOMRenderer
}

const ContentKit = {
Editor, Runtime
Editor
};

export function registerGlobal(global) {
Expand Down
3 changes: 0 additions & 3 deletions src/js/runtime/renderers/mobiledoc-dom.js

This file was deleted.

0 comments on commit 1926c95

Please sign in to comment.