Merge 9c84c1318e into 25d68a34ab

src/generators/dom/index.js

@@ -283,8 +283,8 @@ export default function dom ( parsed, source, options, names ) {
 
 	if ( templateProperties.onrender ) {
 		builders.init.addBlock( deindent`
-			if ( options._root ) {
+			if ( options._parent ) {
-				options._root._renderHooks.push({ fn: template.onrender, context: this });
+				options._parent._renderHooks.push({ fn: template.onrender, context: this });
 			} else {
 				template.onrender.call( this );
 			}
@@ -306,7 +306,7 @@ export default function dom ( parsed, source, options, names ) {
 
 			this._handlers = Object.create( null );
 
-			this._root = options._root;
+			this._parent = options._parent;
 			this._yield = options._yield;
 
 			${builders.init}

src/generators/dom/visitors/Component.js

@@ -56,7 +56,7 @@ export default {
 
 		const componentInitProperties = [
 			`target: ${!isToplevel ? generator.current.target: 'null'}`,
-			'_root: component._root || component'
+			'_parent: component'
 		];
 
 		// Component has children, put them in a separate {{yield}} block