From 1aa9a3677799c979e190e6c0328d6a81f91e33dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Tue, 12 Apr 2016 16:41:36 -0400 Subject: [PATCH 1/5] put d3 in test dashboard global scope --- devtools/test_dashboard/devtools.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devtools/test_dashboard/devtools.js b/devtools/test_dashboard/devtools.js index f3a59832dd3..98ec151298a 100644 --- a/devtools/test_dashboard/devtools.js +++ b/devtools/test_dashboard/devtools.js @@ -1,6 +1,8 @@ var Fuse = require('fuse.js'); var mocks = require('../../build/test_dashboard_mocks.json'); +// put d3 in window scope +var d3 = window.d3 = Plotly.d3; // Our gracious testing object var Tabs = { From e595ebbfdabdaa384af9b72cdc168af60974f72c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Tue, 12 Apr 2016 16:41:57 -0400 Subject: [PATCH 2/5] set dashboard plot width to 1100px by default --- devtools/test_dashboard/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/devtools/test_dashboard/style.css b/devtools/test_dashboard/style.css index bd6f17f1270..524c88e7df1 100644 --- a/devtools/test_dashboard/style.css +++ b/devtools/test_dashboard/style.css @@ -61,4 +61,5 @@ header span{ } .dashboard-plot{ margin-bottom: 30px; + width: 1100px; } From dd447d523daaf7b6036617d6d3a409b9e70f0c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Tue, 12 Apr 2016 16:42:31 -0400 Subject: [PATCH 3/5] declare Plotly global --- devtools/test_dashboard/devtools.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/devtools/test_dashboard/devtools.js b/devtools/test_dashboard/devtools.js index 98ec151298a..76db3eb1e50 100644 --- a/devtools/test_dashboard/devtools.js +++ b/devtools/test_dashboard/devtools.js @@ -1,3 +1,7 @@ +'use strict'; + +/* global Plotly:false */ + var Fuse = require('fuse.js'); var mocks = require('../../build/test_dashboard_mocks.json'); @@ -37,8 +41,8 @@ var Tabs = { plotMock: function(mockName, id) { var mockURL = '/test/image/mocks/' + mockName + '.json'; - window.Plotly.d3.json(mockURL, function(err, fig) { - window.Plotly.plot(Tabs.fresh(id), fig.data, fig.layout); + d3.json(mockURL, function(err, fig) { + Plotly.plot(Tabs.fresh(id), fig.data, fig.layout); console.warn('Plotting:', mockURL); }); @@ -49,12 +53,13 @@ var Tabs = { var gd = Tabs.getGraph(id); if(!gd._fullLayout || !gd._fullData) { + console.error('no graph with id ' + id + ' found.'); return; } var image = new Image(); - window.Plotly.Snapshot.toImage(gd, { format: 'png' }).on('success', function(img) { + Plotly.Snapshot.toImage(gd, { format: 'png' }).on('success', function(img) { image.src = img; var imageDiv = document.getElementById('snapshot'); @@ -74,7 +79,7 @@ var Tabs = { } for(var i = 0; i < plots.length; i++) { - window.Plotly.purge(plots[i]); + Plotly.purge(plots[i]); } }, From aee5afad6a0207548a51edc25a8a320660d41099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Tue, 12 Apr 2016 16:42:45 -0400 Subject: [PATCH 4/5] reorder npm tasks --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4ac3d055a88..6094a7663f1 100644 --- a/package.json +++ b/package.json @@ -35,9 +35,9 @@ "test-syntax": "node test/syntax_test.js", "test-bundle": "node tasks/test_bundle.js", "test": "npm run citest-jasmine && npm run test-image && npm run test-syntax && npm run test-bundle", - "start": "npm run start-test_dashboard", "start-test_dashboard": "node devtools/test_dashboard/server.js", "start-image_viewer": "node devtools/image_viewer/server.js", + "start": "npm run start-test_dashboard", "baseline": "./tasks/baseline.sh", "preversion": "npm-link-check && npm dedupe", "version": "npm run build && git add -A dist src build", From b4368a4a089d991e77fc6df536d58bf1bd44d5ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Tue, 12 Apr 2016 16:43:50 -0400 Subject: [PATCH 5/5] improve server logs: - stringify browserify error objects before logging them - don't log 'Bundle updated' if bundle error --- devtools/test_dashboard/server.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/devtools/test_dashboard/server.js b/devtools/test_dashboard/server.js index e49d2513138..bb55930ac0c 100644 --- a/devtools/test_dashboard/server.js +++ b/devtools/test_dashboard/server.js @@ -134,14 +134,15 @@ function writeFilePromise(path, contents) { function bundlePlotly() { b.bundle(function(err) { if(err) { - console.error('Error while bundling!', err); + console.error('Error while bundling!', JSON.stringify(String(err))); + } else { + console.log('Bundle updated at ' + new Date().toLocaleTimeString()); } if(firstBundle) { open('http://localhost:' + PORT + '/devtools/test_dashboard'); firstBundle = false; } - console.log('Bundle updated at ' + new Date().toLocaleTimeString()); }).pipe(fs.createWriteStream(constants.pathToPlotlyBuild)); } @@ -149,7 +150,7 @@ function bundleDevtools() { return new Promise(function(resolve, reject) { devtools.bundle(function(err) { if(err) { - console.error('Error while bundling!', err); + console.error('Error while bundling!', JSON.stringify(String(err))); return reject(err); } else { return resolve();