Updated to A-Frame 1.0.4

Camichan · Mar 3, 2020 · 9a8cefc · 9a8cefc
1 parent 333ba15
commit 9a8cefc
Show file tree

Hide file tree

Showing 27 changed files with 35 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ Install and use by directly including the [browser files](dist):
 ```html
 <head>
   <title>My A-Frame Scene</title>
-  <script src="https://aframe.io/releases/0.8.2/aframe.min.js"></script>
+  <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
   <script src="https://unpkg.com/aframe-charts-component/dist/aframe-charts-component.min.js"></script>
 </head>
 
@@ -93,7 +93,7 @@ require('aframe-charts-component');
 ```html
 <head>
     <title>My A-Frame Scene</title>
-    <script src="https://aframe.io/releases/0.8.2/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
     <script src="https://unpkg.com/aframe-charts-component/dist/aframe-charts-component.min.js"></script>
     <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
 </head>
@@ -116,7 +116,7 @@ require('aframe-charts-component');
 ```html
 <head>
     <title>My A-Frame Scene</title>
-    <script src="https://aframe.io/releases/0.8.2/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
     <script src="https://unpkg.com/aframe-charts-component/dist/aframe-charts-component.min.js"></script>
 </head>
 

diff --git a/dist/main.js b/dist/main.js
diff --git a/examples/axis/code.html b/examples/axis/code.html
@@ -44,7 +44,7 @@ <h1>Axis properties Chart Code</h1>
 
         <pre><code class="html">&lt;head&gt;
     &lt;title&gt;My A-Frame Scene&lt;/title&gt;
-    &lt;script src="https://aframe.io/releases/1.0.3/aframe.min.js"&gt;&lt;/script&gt;
+    &lt;script src="https://aframe.io/releases/1.0.4/aframe.min.js"&gt;&lt;/script&gt;
     &lt;script src="https://unpkg.com/aframe-charts-component/dist/aframe-charts-component.min.js"&gt;&lt;/script&gt;
 &lt;/head&gt;
 &lt;body&gt;

diff --git a/examples/axis/index.html b/examples/axis/index.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <title>A-Frame A-Charts Component - Axis</title>
         <meta name="description" content="Axis properties example for A-Charts component."/>
-        <script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
+        <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
         <script src="../../dist/aframe-charts-component.min.js"></script>
         <style>
             .home{

diff --git a/examples/barChart/code.html b/examples/barChart/code.html
@@ -42,7 +42,7 @@ <h1>Bar Chart Code</h1>
 
         <pre><code class="html">&lt;head&gt;
     &lt;title&gt;My A-Frame Scene&lt;/title&gt;
-    &lt;script src="https://aframe.io/releases/1.0.3/aframe.min.js"&gt;&lt;/script&gt;
+    &lt;script src="https://aframe.io/releases/1.0.4/aframe.min.js"&gt;&lt;/script&gt;
     &lt;script src="https://unpkg.com/aframe-charts-component/dist/aframe-charts-component.min.js"&gt;&lt;/script&gt;
 &lt;/head&gt;
 &lt;body&gt;

diff --git a/examples/barChart/index.html b/examples/barChart/index.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <title>A-Frame A-Charts Component - Bar</title>
         <meta name="description" content="Bar example for A-Charts component."/>
-        <script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
+        <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
         <script src="../../dist/aframe-charts-component.min.js"></script>
         <style>
             .home{

diff --git a/examples/bubbleChart/code.html b/examples/bubbleChart/code.html
@@ -42,7 +42,7 @@ <h1>Bubble Chart Code</h1>
 
         <pre><code class="html">&lt;head&gt;
     &lt;title&gt;My A-Frame Scene&lt;/title&gt;
-    &lt;script src="https://aframe.io/releases/1.0.3/aframe.min.js"&gt;&lt;/script&gt;
+    &lt;script src="https://aframe.io/releases/1.0.4/aframe.min.js"&gt;&lt;/script&gt;
     &lt;script src="https://unpkg.com/aframe-charts-component/dist/aframe-charts-component.min.js"&gt;&lt;/script&gt;
 &lt;/head&gt;
 &lt;body&gt;

diff --git a/examples/bubbleChart/index.html b/examples/bubbleChart/index.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <title>A-Frame A-Charts Component - Bubble</title>
         <meta name="description" content="Bubble example for A-Charts component."/>
-        <script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
+        <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
         <script src="../../dist/aframe-charts-component.min.js"></script>
         <style>
             .home{

diff --git a/examples/cylinderChart/code.html b/examples/cylinderChart/code.html
@@ -42,7 +42,7 @@ <h1>Cylinder Chart Code</h1>
 
         <pre><code class="html">&lt;head&gt;
     &lt;title&gt;My A-Frame Scene&lt;/title&gt;
-    &lt;script src="https://aframe.io/releases/1.0.3/aframe.min.js"&gt;&lt;/script&gt;
+    &lt;script src="https://aframe.io/releases/1.0.4/aframe.min.js"&gt;&lt;/script&gt;
     &lt;script src="https://unpkg.com/aframe-charts-component/dist/aframe-charts-component.min.js"&gt;&lt;/script&gt;
 &lt;/head&gt;
 &lt;body&gt;

diff --git a/examples/cylinderChart/index.html b/examples/cylinderChart/index.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <title>A-Frame A-Charts Component - Cylinder</title>
         <meta name="description" content="Cylinder example for A-Charts component."/>
-        <script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
+        <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
         <script src="../../dist/aframe-charts-component.min.js"></script>
         <style>
             .home{

diff --git a/examples/dataLoadChart/index.html b/examples/dataLoadChart/index.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <title>A-Frame A-Charts Component - Bar</title>
         <meta name="description" content="Bar example for A-Charts component."/>
-        <script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
+        <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
         <script src="../../dist/aframe-charts-component.min.js"></script>
         <style>
             .home{

diff --git a/examples/legend/code.html b/examples/legend/code.html
@@ -42,7 +42,7 @@ <h1>Legend Chart Code</h1>
 
         <pre><code class="html">&lt;head&gt;
     &lt;title&gt;My A-Frame Scene&lt;/title&gt;
-    &lt;script src="https://aframe.io/releases/1.0.3/aframe.min.js"&gt;&lt;/script&gt;
+    &lt;script src="https://aframe.io/releases/1.0.4/aframe.min.js"&gt;&lt;/script&gt;
     &lt;script src="https://unpkg.com/aframe-charts-component/dist/aframe-charts-component.min.js"&gt;&lt;/script&gt;
 &lt;/head&gt;
 &lt;body&gt;

diff --git a/examples/legend/index.html b/examples/legend/index.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <title>A-Frame A-Charts Component - Bubble</title>
         <meta name="description" content="Bubble example for A-Charts component."/>
-        <script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
+        <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
         <script src="../../dist/aframe-charts-component.min.js"></script>
         <style>
             .home{

diff --git a/examples/museum/code.html b/examples/museum/code.html
@@ -42,7 +42,7 @@ <h1>Dynamic Museum Code</h1>
 
         <pre><code class="html">&lt;head&gt;
     &lt;title&gt;My A-Frame Scene&lt;/title&gt;
-    &lt;script src="https://aframe.io/releases/1.0.3/aframe.min.js"&gt;&lt;/script&gt;
+    &lt;script src="https://aframe.io/releases/1.0.4/aframe.min.js"&gt;&lt;/script&gt;
     &lt;script src="https://unpkg.com/aframe-charts-component/dist/aframe-charts-component.min.js"&gt;&lt;/script&gt;
 &lt;/head&gt;
 &lt;body&gt;

diff --git a/examples/museum/index.html b/examples/museum/index.html
@@ -30,17 +30,16 @@
             <a-entity id="pieDoughnutId"    charts="type: pie;      dataPoints: ../data/dataPositive.json; pie_radius: 5; pie_doughnut: true" position="35 0 -10"></a-entity>
 
             <a-light type="point" intensity="0.7" position="1 30 30"></a-light>
-            <a-entity charts='type: totem;  entity_id_list: barId,bubbleId,pieId,cylinderId,pieDoughnutId;
-                dataPoints_list: {"dataPositive.json": "../data/dataPositive.json", "data.json": "../data/data.json","dataSmall.json": "../data/dataSmall.json"}' position="1 15 10"></a-entity>
+            <a-entity charts="type: totem;  entity_id_list: barId,bubbleId,pieId,cylinderId,pieDoughnutId; dataPoints_list: {'dataPositive.json': '../data/dataPositive.json', 'data.json': '../data/data.json','dataSmall.json': '../data/dataSmall.json'}" position="1 15 10"></a-entity>
 
-
-            <a-entity movement-controls="fly: true" position="0 30 30" rotation="-24 15 0"> <!-- Camera fly movement. -->
+            <a-entity position="0 30 30" rotation="-24 15 0">
                 <a-camera position="4.2 -1 1.5" rotation="0 -1 0">
                 </a-camera>
             </a-entity>
             <!-- Control for Oculus Rift and VR Devices. -->
-            <a-entity id="leftHand" hand-controls="hand: left; handModelStyle: lowPoly; color: #ffcccc"></a-entity>
-            <a-entity id="rightHand" hand-controls="hand: right; handModelStyle: lowPoly; color: #ffcccc"></a-entity>
+            <a-entity laser-controls="hand: right" daydream-controls="" gearvr-controls="" magicleap-controls="" oculus-go-controls="" oculus-touch-controls="" vive-controls="" vive-focus-controls="" windows-motion-controls="" generic-tracked-controller-controls=""></a-entity>
+            <a-entity oculus-go-controls="" x-button-listener=""></a-entity>
+            <a-entity laser-controls="hand: left" daydream-controls="" gearvr-controls="" magicleap-controls="" oculus-go-controls="" oculus-touch-controls="" vive-controls="" vive-focus-controls="" windows-motion-controls="" generic-tracked-controller-controls=""></a-entity>
 
         </a-scene>
 

diff --git a/examples/pieChart/code.html b/examples/pieChart/code.html
@@ -42,7 +42,7 @@ <h1>Pie Chart Code</h1>
 
         <pre><code class="html">&lt;head&gt;
     &lt;title&gt;My A-Frame Scene&lt;/title&gt;
-    &lt;script src="https://aframe.io/releases/1.0.3/aframe.min.js"&gt;&lt;/script&gt;
+    &lt;script src="https://aframe.io/releases/1.0.4/aframe.min.js"&gt;&lt;/script&gt;
     &lt;script src="https://unpkg.com/aframe-charts-component/dist/aframe-charts-component.min.js"&gt;&lt;/script&gt;
 &lt;/head&gt;
 &lt;body&gt;

diff --git a/examples/pieChart/index.html b/examples/pieChart/index.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <title>A-Frame A-Charts Component - Pie</title>
         <meta name="description" content="Pie example for A-Charts component."/>
-        <script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
+        <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
         <script src="../../dist/aframe-charts-component.min.js"></script>
         <style>
             .home{

diff --git a/examples/pieDoughnutChart/code.html b/examples/pieDoughnutChart/code.html
@@ -42,7 +42,7 @@ <h1>Doughnut Chart Code</h1>
 
         <pre><code class="html">&lt;head&gt;
     &lt;title&gt;My A-Frame Scene&lt;/title&gt;
-    &lt;script src="https://aframe.io/releases/1.0.3/aframe.min.js"&gt;&lt;/script&gt;
+    &lt;script src="https://aframe.io/releases/1.0.4/aframe.min.js"&gt;&lt;/script&gt;
     &lt;script src="https://unpkg.com/aframe-charts-component/dist/aframe-charts-component.min.js"&gt;&lt;/script&gt;
 &lt;/head&gt;
 &lt;body&gt;

diff --git a/examples/pieDoughnutChart/index.html b/examples/pieDoughnutChart/index.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <title>A-Frame A-Charts Component - Doughnut</title>
         <meta name="description" content="Doughnut example for A-Charts component."/>
-        <script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
+        <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
         <script src="../../dist/aframe-charts-component.min.js"></script>
         <style>
             .home{

diff --git a/examples/popup/code.html b/examples/popup/code.html
@@ -42,7 +42,7 @@ <h1>Pop up Chart Code</h1>
 
         <pre><code class="html">&lt;head&gt;
     &lt;title&gt;My A-Frame Scene&lt;/title&gt;
-    &lt;script src="https://aframe.io/releases/1.0.3/aframe.min.js"&gt;&lt;/script&gt;
+    &lt;script src="https://aframe.io/releases/1.0.4/aframe.min.js"&gt;&lt;/script&gt;
     &lt;script src="https://unpkg.com/aframe-charts-component/dist/aframe-charts-component.min.js"&gt;&lt;/script&gt;
 &lt;/head&gt;
 &lt;body&gt;

diff --git a/examples/popup/index.html b/examples/popup/index.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <title>A-Frame A-Charts Component - Bubble</title>
         <meta name="description" content="Bubble example for A-Charts component."/>
-        <script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
+        <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
         <script src="../../dist/aframe-charts-component.min.js"></script>
         <style>
             .home{

diff --git a/examples/tonsOfData/index.html b/examples/tonsOfData/index.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <title>A-Frame A-Charts Component - Tons of data</title>
         <meta name="description" content="Tons of data example for A-Charts component."/>
-        <script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
+        <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
         <script src="../../dist/aframe-charts-component.min.js"></script>
         <style>
             .home{

diff --git a/examples/totem/code.html b/examples/totem/code.html
@@ -42,7 +42,7 @@ <h1>Totem Code</h1>
 
         <pre><code class="html">&lt;head&gt;
     &lt;title&gt;My A-Frame Scene&lt;/title&gt;
-    &lt;script src="https://aframe.io/releases/1.0.3/aframe.min.js"&gt;&lt;/script&gt;
+    &lt;script src="https://aframe.io/releases/1.0.4/aframe.min.js"&gt;&lt;/script&gt;
     &lt;script src="https://unpkg.com/aframe-charts-component/dist/aframe-charts-component.min.js"&gt;&lt;/script&gt;
 &lt;/head&gt;
 &lt;body&gt;

diff --git a/examples/totem/index.html b/examples/totem/index.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <title>A-Frame A-Charts Component - Totem</title>
         <meta name="description" content="Totem example for A-Charts component."/>
-        <script src="https://aframe.io/releases/1.0.3/aframe.min.js"></script>
+        <script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
         <script src="../../dist/aframe-charts-component.min.js"></script>
         <style>
             .home{
@@ -26,7 +26,7 @@
             <a-entity id="barId"            charts="type: bar;      dataPoints: ../data/dataPositive.json" position="-20 22 14" rotation="0 30 -10"></a-entity>
 
             <a-light type="point" intensity="0.7" position="1 30 30"></a-light>
-            <a-entity charts='type: totem;  entity_id_list: barId; dataPoints_list: {"dataPositive.json": "../data/dataPositive.json", "data.json": "../data/data.json", "dataSmall.json": "../data/dataSmall.json"}' position="1 15 10"></a-entity>
+            <a-entity charts="type: totem;  entity_id_list: barId; dataPoints_list: {'dataPositive.json': '../data/dataPositive.json', 'data.json': '../data/data.json', 'dataSmall.json': '../data/dataSmall.json'}" position="1 15 10"></a-entity>
 
 
             <a-entity movement-controls="fly: true" position="0 30 30" rotation="-24 15 0">

diff --git a/index.js b/index.js
@@ -461,7 +461,7 @@ function generateTotem(properties, element) {
     if(properties.dataPoints_list === '')
         return;
 
-    let dataPoints_list = properties.dataPoints_list.constructor === ({}).constructor ? properties.dataPoints_list : JSON.parse(properties.dataPoints_list);
+    let dataPoints_list = properties.dataPoints_list.constructor === ({}).constructor ? properties.dataPoints_list : JSON.parse(properties.dataPoints_list.replace(/'/g, '"'));
     let position = getPosition(element);
     let width = getTotemWidth(dataPoints_list);
     element.appendChild(generateTotemTitle(width, position));

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aframe-charts-component",
-  "version": "2.1.8",
+  "version": "2.1.10",
   "description": "Make 3D Charts with this component based on A-Frame.",
   "main": "index.js",
   "unpkg": "dist/aframe-charts-component.min.js",
@@ -41,7 +41,7 @@
   },
   "homepage": "https://github.com/adrixp/aframe-charts-component#readme",
   "devDependencies": {
-    "aframe": "^1.0.3",
+    "aframe": "^1.0.4",
     "browserify": "^16.2.3",
     "budo": "^11.6.2",
     "chai": "^3.4.1",