Skip to content

Commit 37c7064

Browse files
chancancoderwjblue
authored andcommitted
Move to new HTMLBars internal block API
(cherry picked from commit a4f017e78224f8f4ac62cea0bb40b15814398263)
1 parent 2a44c09 commit 37c7064

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

packages/ember-htmlbars/lib/hooks/component.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ export default function componentHook(renderNode, env, scope, _tagName, params,
8484
let contentOptions = { templates, scope };
8585

8686
let { block } = buildComponentTemplate(templateOptions, attrs, contentOptions);
87-
block(env, [], undefined, renderNode, scope, visitor);
87+
block.invoke(env, [], undefined, renderNode, scope, visitor);
8888
} else if (isNormalHTMLElement) {
8989
let block = buildHTMLTemplate(tagName, attrs, { templates, scope });
90-
block(env, [], undefined, renderNode, scope, visitor);
90+
block.invoke(env, [], undefined, renderNode, scope, visitor);
9191
} else {
9292
// Invoking a component from the outside (either via <foo-bar> angle brackets
9393
// or {{foo-bar}} legacy curlies).

packages/ember-htmlbars/lib/keywords/legacy-yield.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ export default function legacyYield(morph, env, _scope, params, hash, template,
1414
scope.locals.controller = new ProxyStream(hash.controller, 'controller');
1515
scope.overrideController = true;
1616
}
17-
scope.blocks.default(env, [], params[0], morph, scope, visitor);
17+
scope.blocks.default.invoke(env, [], params[0], morph, scope, visitor);
1818
} else {
19-
scope.blocks.default(env, params, undefined, morph, scope, visitor);
19+
scope.blocks.default.invoke(env, params, undefined, morph, scope, visitor);
2020
}
2121

2222
return true;

packages/ember-htmlbars/lib/node-managers/component-node-manager.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ ComponentNodeManager.prototype.render = function(_env, visitor) {
173173
env.renderedViews.push(component.elementId);
174174

175175
if (this.block) {
176-
this.block(env, [], undefined, this.renderNode, this.scope, visitor);
176+
this.block.invoke(env, [], undefined, this.renderNode, this.scope, visitor);
177177
}
178178

179179
let element;
@@ -232,7 +232,7 @@ ComponentNodeManager.prototype.rerender = function(_env, attrs, visitor) {
232232
env.renderedViews.push(component.elementId);
233233

234234
if (this.block) {
235-
this.block(env, [], undefined, this.renderNode, this.scope, visitor);
235+
this.block.invoke(env, [], undefined, this.renderNode, this.scope, visitor);
236236
}
237237

238238
env.lifecycleHooks.push({ type: 'didUpdate', view: component });

packages/ember-htmlbars/lib/node-managers/view-node-manager.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ ViewNodeManager.prototype.render = function(env, attrs, visitor) {
9191
}
9292

9393
if (this.block) {
94-
this.block(newEnv, [], undefined, this.renderNode, this.scope, visitor);
94+
this.block.invoke(newEnv, [], undefined, this.renderNode, this.scope, visitor);
9595
}
9696

9797
if (component) {
@@ -131,7 +131,7 @@ ViewNodeManager.prototype.rerender = function(env, attrs, visitor) {
131131
env.renderedViews.push(component.elementId);
132132
}
133133
if (this.block) {
134-
this.block(newEnv, [], undefined, this.renderNode, this.scope, visitor);
134+
this.block.invoke(newEnv, [], undefined, this.renderNode, this.scope, visitor);
135135
}
136136

137137
return newEnv;

packages/ember-htmlbars/tests/glimmer-component/render-test.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if (isEnabled('ember-htmlbars-component-generation')) {
2323
component = this;
2424
this._super(...arguments);
2525
},
26-
layout: compile(`<my-component>{{yield}}</my-component>`)
26+
layout: compile(`<my-component>...{{yield}}...</my-component>`)
2727
});
2828

2929
renderComponent('my-component', {
@@ -34,6 +34,7 @@ if (isEnabled('ember-htmlbars-component-generation')) {
3434
ok(component instanceof GlimmerComponent, 'the component was instantiated correctly');
3535
equal(view.childViews[0], component, 'the component was rendered and inserted into child views');
3636
hasSelector(assert, `my-component.ember-view[id=${component.elementId}]`);
37+
equal(view.$().text(), '...Hello world...');
3738
});
3839
}
3940

0 commit comments

Comments
 (0)