build version 0.0.6

frappe · Nov 15, 2017 · a9c6bcb · a9c6bcb
1 parent 4c9ca48
commit a9c6bcb
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@
 * ...or include within your HTML
 
   ```html
-    <script src="https://unpkg.com/frappe-charts@0.0.5/dist/frappe-charts.min.iife.js"></script>
+    <script src="https://unpkg.com/frappe-charts@0.0.6/dist/frappe-charts.min.iife.js"></script>
   ```
 
 #### Usage

diff --git a/dist/frappe-charts.esm.js b/dist/frappe-charts.esm.js
@@ -788,12 +788,15 @@ class BaseChart {
 			console.error("No parent element to render on was provided.");
 			return;
 		}
-		this.validate_and_prepare_data();
-		this.bind_window_events();
-		this.refresh(true);
+		if(this.validate_and_prepare_data()) {
+			this.bind_window_events();
+			this.refresh(true);
+		}
 	}
 
-	validate_and_prepare_data() {}
+	validate_and_prepare_data() {
+		return true;
+	}
 
 	bind_window_events() {
 		window.addEventListener('resize', () => this.refresh());
@@ -970,8 +973,8 @@ class AxisChart extends BaseChart {
 	constructor(args) {
 		super(args);
 
-		this.x = this.data.labels;
-		this.y = this.data.datasets;
+		this.x = this.data.labels || [];
+		this.y = this.data.datasets || [];
 
 		this.is_series = args.is_series;
 
@@ -980,7 +983,11 @@ class AxisChart extends BaseChart {
 
 		this.zero_line = this.height;
 
-		this.old_values = {};
+		// this.old_values = {};
+	}
+
+	validate_and_prepare_data() {
+		return true;
 	}
 
 	setup_values() {
@@ -2719,14 +2726,6 @@ class Heatmap extends BaseChart {
 	}
 }
 
-// if ("development" !== 'production') {
-// 	// Enable LiveReload
-// 	document.write(
-// 		'<script src="http://' + (location.host || 'localhost').split(':')[0] +
-// 		':35729/livereload.js?snipver=1"></' + 'script>'
-// 	);
-// }
-
 const chartTypes = {
 	line: LineChart,
 	bar: BarChart,

diff --git a/dist/frappe-charts.min.cjs.js b/dist/frappe-charts.min.cjs.js
diff --git a/dist/frappe-charts.min.esm.js b/dist/frappe-charts.min.esm.js
diff --git a/dist/frappe-charts.min.iife.js b/dist/frappe-charts.min.iife.js
diff --git a/docs/assets/js/frappe-charts.min.js b/docs/assets/js/frappe-charts.min.js
diff --git a/docs/index.html b/docs/index.html
@@ -53,7 +53,7 @@ <h6 class="margin-vertical-rem">
               <p class="step-explain">And include it in your project</p>
               <pre><code class="hljs javascript">  import Chart from "frappe-charts/dist/frappe-charts.min.esm"</code></pre>
               <p class="step-explain">... or include it directly in your HTML</p>
-              <pre><code class="hljs html">  &lt;script src="https://unpkg.com/frappe-charts@0.0.5/dist/frappe-charts.min.iife.js"&gt;&lt;/script&gt;</code></pre>
+              <pre><code class="hljs html">  &lt;script src="https://unpkg.com/frappe-charts@0.0.6/dist/frappe-charts.min.iife.js"&gt;&lt;/script&gt;</code></pre>
               <p class="step-explain">Make a new Chart</p>
               <pre><code class="hljs html">  &lt!--HTML--&gt;
   &lt;div id="chart"&gt;&lt;/div&gt;</code></pre>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frappe-charts",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "https://frappe.github.io/charts",
   "main": "dist/frappe-charts.min.cjs.js",
   "module": "dist/frappe-charts.min.esm.js",

diff --git a/src/scripts/charts/AxisChart.js b/src/scripts/charts/AxisChart.js
@@ -9,8 +9,8 @@ export default class AxisChart extends BaseChart {
 	constructor(args) {
 		super(args);
 
-		this.x = this.data.labels;
-		this.y = this.data.datasets;
+		this.x = this.data.labels || [];
+		this.y = this.data.datasets || [];
 
 		this.is_series = args.is_series;
 
@@ -19,7 +19,11 @@ export default class AxisChart extends BaseChart {
 
 		this.zero_line = this.height;
 
-		this.old_values = {};
+		// this.old_values = {};
+	}
+
+	validate_and_prepare_data() {
+		return true;
 	}
 
 	setup_values() {

diff --git a/src/scripts/charts/BaseChart.js b/src/scripts/charts/BaseChart.js
@@ -92,12 +92,15 @@ export default class BaseChart {
 			console.error("No parent element to render on was provided.");
 			return;
 		}
-		this.validate_and_prepare_data();
-		this.bind_window_events();
-		this.refresh(true);
+		if(this.validate_and_prepare_data()) {
+			this.bind_window_events();
+			this.refresh(true);
+		}
 	}
 
-	validate_and_prepare_data() {}
+	validate_and_prepare_data() {
+		return true;
+	}
 
 	bind_window_events() {
 		window.addEventListener('resize', () => this.refresh());