plotly · etpinard · Nov 13, 2015 · Nov 7, 2015 · Nov 10, 2015 · Nov 10, 2015
diff --git a/.ackrc b/.ackrc
@@ -0,0 +1,6 @@
+--ignore-directory=is:dist
+--ignore-directory=is:build
+--ignore-directory=is:assets
+
+--ignore-file=ext:svg
+--ignore-file=ext:log
diff --git a/.gitignore b/.gitignore
@@ -1 +1,9 @@
 node_modules
+
+build/*
+!build/README.md
+
+dist/*
+!dist/README.md
+
+npm-debug.log
diff --git a/LICENSE b/LICENSE
diff --git a/build/README.md b/build/README.md
@@ -0,0 +1 @@
+Directory of non-distributed built files
diff --git a/devtools/image_viewer/index.html b/devtools/image_viewer/index.html
@@ -6,7 +6,6 @@
  <div id="plot-images"></div>
  <div id="plot-mock"></div>
 
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.6/d3.min.js"></script>
- <script type="text/javascript" src="test-images-viewer-bundle.js"></script>
+ <script type="text/javascript" src="../../build/image_viewer-bundle.js"></script>
 </body>
 </html>
diff --git a/devtools/image_viewer/server.js b/devtools/image_viewer/server.js
@@ -1,33 +1,42 @@
-'use strict';
-
-var http = require('http');
-var ecstatic = require('ecstatic');
-var browserify = require('browserify');
-var open = require('open');
 var fs = require('fs');
+var http = require('http');
+var path = require('path');
 var exec = require('child_process').exec;
 
-var bundleName = 'test-images-viewer-bundle.js',
- listName = 'list-of-incorrect-images.txt';
+var browserify = require('browserify');
+var ecstatic = require('ecstatic');
+var _open = require('open');
+
+var constants = require('../../tasks/util/constants');
 
-fs.unlink(bundleName, function(err) {
+
+// TODO make this an optional argument
+var PORT = '9090';
+
+console.log('Listening on :' + PORT + '\n');
+
+var listName = 'list-of-incorrect-images.txt';
+
+// build image viewer bundle
+fs.unlink(constants.pathToImageViewerBundle, function() {
  exec('ls ../test-images-diffs/ > ' + listName, function() {
- var b = browserify('./viewer.js', {
- debug: true,
- verbose: true
- });
+ var b = browserify(path.join(__dirname, './viewer.js'), { debug: true });
+
  b.transform('brfs');
- b.bundle().pipe(fs.createWriteStream(bundleName));
+ b.bundle(function(err) {
+ if(err) throw err;
+
+ _open('http://localhost:' + PORT + '/devtools/image_viewer');
+ })
+ .pipe(fs.createWriteStream(constants.pathToImageViewerBundle));
 
  fs.readFile(listName, 'utf8', function(err, data) {
  console.log('In ' + listName + ':\n' + data);
  });
  });
 });
 
+// boot up server
 http.createServer(
- ecstatic({ root: '../.' })
-).listen(9090);
-
-console.log('Listening on :9090\n');
-open('http://localhost:9090/test-images-viewer');
+ ecstatic({ root: constants.pathToRoot })
+).listen(PORT);
diff --git a/devtools/image_viewer/viewer.js b/devtools/image_viewer/viewer.js
@@ -1,8 +1,5 @@
-'use strict';
-
-/* global d3:false */
-
 var fs = require('fs');
+var d3 = require('d3');
 
 var $plotlist = document.getElementById('plot-list'),
  $images = document.getElementById('plot-images'),

diff --git a/devtools/test_dashboard/buttons.js b/devtools/test_dashboard/buttons.js
@@ -1,5 +1,3 @@
-'use strict';
-
 var plotlist = document.getElementById('plot-list');
 var anchor = document.getElementById('embedded-graph');
 var image = document.getElementById('embedded-image');
@@ -111,7 +109,7 @@ function plotButtons(plots, figDir) {
  plotlist.appendChild(pummelButton);
 
  var i = 0;
- var mock = require('./testplots/marker-color.json');
+ var mock = require('./testplots-3d/marker-color.json');
  var statusDiv = document.getElementById('status-info');
 
  pummelButton.addEventListener('click', function () {

diff --git a/devtools/test_dashboard/generateImages.js b/devtools/test_dashboard/generateImages.js
diff --git a/devtools/test_dashboard/index.html b/devtools/test_dashboard/index.html
@@ -1,67 +1,39 @@
 <!DOCTYPE html>
 <head>
-
- <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans:600,400,300,200|Droid+Sans|PT+Sans+Narrow|Gravitas+One|Droid+Sans+Mono|Droid+Serif|Raleway|Old+Standard+TT" />
-
+ <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans:600,400,300,200|Droid+Sans|PT+Sans+Narrow|Gravitas+One|Droid+Sans+Mono|Droid+Serif|Raleway|Old+Standard+TT" />
 </head>
-
 <body>
 
- <div id="plot-list" style="overflow:auto; height: 100px;"></div>
- <div id="status-info" style="display: block; position: absolute; top: 150px;"></div>
- <div id="embedded-graph"></div>
- <div id="embedded-image"style="
- display: block;
- position: absolute;
- top: 800px;
- ">
- </div>
-
- <script type="text/javascript" src="./../shelly/shelly/static/js/plugins/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
-
- <script>
- PLOTLYENV = {
- TOPOJSON_URL: '../shelly/plotlyjs/static/plotlyjs/src/geo/topojson/'
- };
- </script>
+ <div id="plot-list" style="overflow:auto; height:100px;"></div>
+ <div id="status-info" style="display:block; position:absolute; top:150px;"></div>
+ <div id="embedded-graph"></div>
+ <div id="embedded-image" style="display:block; position:absolute; top:800px;"></div>
 
- <script type="text/javascript" src="./../shelly/plotlyjs/static/plotlyjs/build/plotlyjs-bundle.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../dist/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
 
- <script type="text/javascript" src="test-bundle.js"></script>
+ <script type="text/javascript" src="../../dist/plotly.js" charset="utf-8"></script>
+ <script>PLOTLYENV = { TOPOJSON_URL: '../../src/assets/topojson/' };</script>
 
- <script>
- MathJax.Hub.Config({
- messageStyle: 'none',
- skipStartupTypeset: true,
- displayAlign: "left",
- tex2jax: {
- inlineMath: [["$","$"],["\\(","\\)"]]
- }
- });
- </script>
+ <script type="text/javascript" src="../../build/test_dashboard-bundle.js"></script>
 
- <script>
+ <!-- helper functions to manipulate graph div -->
+ <script>
  var Tabs = {
-get: function() {
+getGraph: function() {
  return document.getElementById('embedded-graph').children[0];
  },
  fresh: function() {
  var anchor = document.getElementById('embedded-graph'),
- plotDiv = Tabs.get();
- if(plotDiv) anchor.removeChild(plotDiv);
- plotDiv = document.createElement('div');
- anchor.appendChild(plotDiv);
- return plotDiv;
- }
- };
+ graphDiv = Tabs.getGraph();
 
- Tabs.getGraph = Tabs.get;
+ if(graphDiv) anchor.removeChild(graphDiv);
+ graphDiv = document.createElement('div');
+ anchor.appendChild(graphDiv);
 
-var Themes = {
-reTileLock: null
+ return graphDiv;
+}
  };
- </script>
-
+ </script>
 
 </body>
 </html>
diff --git a/devtools/test_dashboard/make-test-2d.js b/devtools/test_dashboard/make-test-2d.js
diff --git a/devtools/test_dashboard/package.json b/devtools/test_dashboard/package.json