Merge branch 'graphs_insights_issues' into 'master'

Graphs insights issues See merge request mistio/polyana-dashboard!34
mistio · Nov 16, 2017 · c3bed5c · c3bed5c
2 parents 05c844b + 0e6df93
commit c3bed5c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "polyana-dashboard",
-  "version": "0.3.5",
+  "version": "0.4.0",
   "authors": [
     "Dimitris Moraitis <[email protected]>",
     "Christina Papakonstantinou <[email protected]>"

diff --git a/dashboard-panel.html b/dashboard-panel.html
@@ -7,7 +7,6 @@
 <link rel="import" href="../iron-ajax/iron-ajax.html">
 <link rel="import" href="../iron-resizable-behavior/iron-resizable-behavior.html">
 
-<script src="../echarts/dist/echarts.js"></script>
 <script src='../moment/min/moment.min.js'></script>
 <script src='../timerange-picker/relative.time.parser.js'></script>
 

diff --git a/echarts-import.html b/echarts-import.html
@@ -0,0 +1 @@
+<script src="../echarts/dist/echarts.min.js"></script>
diff --git a/polyana-dashboard.html b/polyana-dashboard.html
@@ -129,7 +129,16 @@
             },
 
             attached: function() {
-                console.debug('dashboard attached');
+                if (typeof echarts == 'undefined'){
+                    this.importHref(this.resolveUrl('echarts-import.html'), this.initDashboard, function(e) {
+                        console.error('Failed to load echarts', e);
+                    }, true);
+                } else {
+                    this.initDashboard();
+                }
+            },
+
+            initDashboard: function(){
                 moment = initializeMomentRelative(moment);
                 this._updateDashboard();
             },
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<script src="../echarts/dist/echarts.min.js"></script>