diff --git a/packages/blaze/package.js b/packages/blaze/package.js index 791f177b2c..65b4e250da 100644 --- a/packages/blaze/package.js +++ b/packages/blaze/package.js @@ -14,15 +14,21 @@ Package.on_use(function (api) { api.add_files([ 'preamble.js', 'sequence.js', - 'var.js', + 'var.js' + ]); + + api.add_files([ 'dombackend.js', 'domrange.js', 'events.js', + 'attrs.js' + ], 'client'); + + api.add_files([ 'render.js', 'component.js', - 'attrs.js', 'materialize.js' - ], 'client'); + ]); }); Package.on_test(function (api) { diff --git a/packages/templating/plugin/html_scanner.js b/packages/templating/plugin/html_scanner.js index 54d7e548af..4ca8f0276b 100644 --- a/packages/templating/plugin/html_scanner.js +++ b/packages/templating/plugin/html_scanner.js @@ -175,7 +175,7 @@ html_scanner = { }); // We may be one of many `` tags. - results.js += "\nUI.body.contentParts.push(UI.Component.extend({render: " + renderFuncCode + "}));\nMeteor.startup(function () { if (! UI.body.INSTANTIATED) { UI.body.INSTANTIATED = true; UI.DomRange.insert(UI.render(UI.body).dom, document.body); } });\n"; + results.js += "\nUI.body2.contentParts.push(" + renderFuncCode + ");\nMeteor.startup(function () { if (! UI.body2.domrange) { Blaze.render(function () { return UI.body2; }).attach(document.body); } });\n"; } } catch (e) { if (e.scanner) { diff --git a/packages/ui/newblaze.js b/packages/ui/newblaze.js new file mode 100644 index 0000000000..00c5422236 --- /dev/null +++ b/packages/ui/newblaze.js @@ -0,0 +1,7 @@ +UI.body2 = new Blaze.Component(); +_.extend(UI.body2, { + contentParts: [], + render: function () { + return _.map(this.contentParts, function (f) { return f(); }); + } +}); diff --git a/packages/ui/package.js b/packages/ui/package.js index f6ac88b596..1a6dfe9816 100644 --- a/packages/ui/package.js +++ b/packages/ui/package.js @@ -17,6 +17,9 @@ Package.on_use(function (api) { api.use('htmljs'); api.imply('htmljs'); + api.use('blaze'); + api.imply('blaze'); + api.add_files(['exceptions.js', 'base.js']); api.add_files(['dombackend.js', @@ -32,6 +35,8 @@ Package.on_use(function (api) { ]); api.add_files(['handlebars_backcompat.js']); + + api.add_files(['newblaze.js']); }); Package.on_test(function (api) {