feat(dialog): make dialog entities children of the parent

patrickocoffeyo · patrickocoffeyo · commit 905a7766ca13 · 2018-07-06T12:32:08.000-05:00
diff --git a/examples/advanced/index.html b/examples/advanced/index.html
@@ -9,15 +9,11 @@
   </head>
   <body>
     <a-scene inspector="url: https://aframe.io/releases/0.3.0/aframe-inspector.min.js">
-      <a-camera
-        id="camera"
-        wasd-controls-enabled="false"
-        cursor="rayOrigin: mouse"
-      />
-      <a-sky color="#24CAFF" />
+      <a-camera id="camera" wasd-controls-enabled="false" cursor="rayOrigin: mouse"></a-camera>
+      <a-sky color="#24CAFF"></a-sky>
       <a-entity
         id="dialog"
-        position="0 0 -4"
+        position="0 0 -2"
         dialog-popup="
           openIconImage: ../assets/info.jpg;
           closeIconImage: ../assets/close.jpg;
@@ -31,7 +27,7 @@
           bodyColor: #603300;
           dialogBoxHeight: 3.5;
           dialogBoxColor: #964f00;
-          "/>
+          "></a-entity>
     </a-scene>
 
     <!-- GitHub Corner. -->
diff --git a/examples/basic/index.html b/examples/basic/index.html
@@ -9,22 +9,17 @@
   </head>
   <body>
     <a-scene inspector="url: https://aframe.io/releases/0.3.0/aframe-inspector.min.js">
-      <a-camera
-        id="camera"
-        wasd-controls-enabled="false"
-        cursor="rayOrigin: mouse"
-      />
-      <a-sky color="#24CAFF" />
+      <a-camera id="camera" wasd-controls-enabled="false" cursor="rayOrigin: mouse"></a-camera>
+      <a-sky color="#24CAFF"></a-sky>
       <a-entity
         id="dialog"
-        position="0 0 -4"
+        position="0 0 -2"
         dialog-popup="
           openIconImage: ../assets/info.jpg;
           closeIconImage: ../assets/close.jpg;
-          image: ../assets/tony.jpg;
-          title: This is an example title.
-          body: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean dolor sem, consectetur sed nibh a, placerat semper augue. Aenean consectetur nec nunc vestibulum aliquet. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean dolor sem, consectetur sed nibh a, placerat semper augue.
-          "/>
+          title: Kellogg's frosted flakes;
+          body: Frosted Flakes or Frosties is a breakfast cereal, produced by the Kellogg Company and consisting of sugar-coated corn flakes. It was introduced in the United States in 1952, as Sugar Frosted Flakes.;
+          "></a-entity>
     </a-scene>
 
     <!-- GitHub Corner. -->
diff --git a/index.js b/index.js
@@ -337,6 +337,6 @@ AFRAME.registerComponent('dialog-popup', {
     wrapper.setAttribute('id', `${this.el.getAttribute('id')}--wrapper`);
     wrapper.appendChild(this.generateOpenIcon());
     wrapper.appendChild(this.generateDialogPlane());
-    this.el.sceneEl.appendChild(wrapper);
+    this.el.appendChild(wrapper);
   }
 });

Original file line number	Diff line number	Diff line change
`@@ -337,6 +337,6 @@ AFRAME.registerComponent('dialog-popup', {`
`337`	`337`	wrapper.setAttribute('id', `${this.el.getAttribute('id')}--wrapper`);
`338`	`338`	`wrapper.appendChild(this.generateOpenIcon());`
`339`	`339`	`wrapper.appendChild(this.generateDialogPlane());`
`340`		`- this.el.sceneEl.appendChild(wrapper);`
	`340`	`+ this.el.appendChild(wrapper);`
`341`	`341`	`}`
`342`	`342`	`});`