Merge branch 'master' into doeg-exp-request-store

Author: doeg

image_server/test/mocks/empty.json

@@ -0,0 +1,4 @@
+{
+    "data": [],
+    "layout": {}
+}

image_server/test/test-images-baseline/empty.png

@@ -25,7 +25,6 @@ func.defaultConfig = {
     files: [
         shellyStatic + 'plugins/jquery-1.8.3.min.js',
         //'../../../streaming/static/streaming/build/streamhead-bundle.js',
-        shellyStatic + 'plugins/d3.v3.min.js',
         'tests/*_test.js'
     ],
 

shelly/plotlyjs/static/plotlyjs/karma.conf.js

@@ -13,6 +13,7 @@
     "arraytools": "^1.0.0",
     "browserify": "^6.1.0",
     "convex-hull": "^1.0.3",
+    "d3": "3.3.5",
     "delaunay-triangulate": "^1.1.6",
     "gl-error3d": "^1.0.0",
     "gl-line3d": "^1.0.1",

shelly/plotlyjs/static/plotlyjs/package.json

@@ -1,12 +1,11 @@
 'use strict';
 
-// ---external global dependencies
-/* global d3:false */
-
-var annotations = module.exports = {},
-    Plotly = require('./plotly'),
+var Plotly = require('./plotly'),
+    d3 = require('d3'),
     isNumeric = require('./isnumeric');
 
+var annotations = module.exports = {};
+
 // centerx is a center of scaling tuned for maximum scalability of
 // the arrowhead ie throughout mag=0.3..3 the head is joined smoothly
 // to the line, but the endpoint moves.

shelly/plotlyjs/static/plotlyjs/src/annotations.js

@@ -1,12 +1,14 @@
 'use strict';
 
 // ---external global dependencies
-/* global d3:false, Promise:false */
+/* Promise:false */
 
-var axes = module.exports = {},
-    Plotly = require('./plotly'),
+var Plotly = require('./plotly'),
+    d3 = require('d3'),
     isNumeric = require('./isnumeric');
 
+var axes = module.exports = {};
+
 Plotly.Plots.registerSubplot('cartesian', ['xaxis', 'yaxis'], ['x', 'y'], {
     xaxis: {
         valType: 'axisid',
@@ -2354,7 +2356,7 @@ axes.listIds = function(td, axletter) {
 
 // get an axis object from its id 'x','x2' etc
 // optionally, id can be a subplot (ie 'x2y3') and type gets x or y from it
-axes.getFromId = function(td,id,type) {
+axes.getFromId = function(td, id, type) {
     var fullLayout = td._fullLayout;
 
     if(type==='x') id = id.replace(/y[0-9]*/,'');
@@ -2873,8 +2875,11 @@ axes.doTicks = function(td, axid, skipTitle) {
     }
     else {
         var alldone = axes.getSubplots(td,ax).map(function(subplot) {
-            var plotinfo = fullLayout._plots[subplot],
-                container = plotinfo[axletter+'axislayer'],
+            var plotinfo = fullLayout._plots[subplot];
+
+            if(!fullLayout._hasCartesian) return;
+
+            var container = plotinfo[axletter + 'axislayer'],
 
                 // [bottom or left, top or right, free, main]
                 linepositions = ax._linepositions[subplot]||[],

shelly/plotlyjs/static/plotlyjs/src/axes.js

@@ -1,12 +1,11 @@
 'use strict';
 
-// ---external global dependencies
-/* global d3:false */
-
-var bars = module.exports = {},
-    Plotly = require('./plotly'),
+var Plotly = require('./plotly'),
+    d3 = require('d3'),
     isNumeric = require('./isnumeric');
 
+var bars = module.exports = {};
+
 Plotly.Plots.register(bars, 'bar',
     ['cartesian', 'bar', 'oriented', 'markerColorscale', 'errorBarsOK', 'showLegend'], {
     description: [

shelly/plotlyjs/static/plotlyjs/src/bars.js

@@ -1,12 +1,11 @@
 'use strict';
 
-// ---external global dependencies
-/* global d3:false */
-
-var boxes = module.exports = {},
-    Plotly = require('./plotly'),
+var Plotly = require('./plotly'),
+    d3 = require('d3'),
     isNumeric = require('./isnumeric');
 
+var boxes = module.exports = {};
+
 Plotly.Plots.register(boxes, 'box',
     ['cartesian', 'symbols', 'oriented', 'box', 'showLegend'], {
     description: [

shelly/plotlyjs/static/plotlyjs/src/boxes.js

@@ -1,9 +1,10 @@
 'use strict';
 
-var color = module.exports = {},
-    tinycolor = require('tinycolor2'),
+var tinycolor = require('tinycolor2'),
     isNumeric = require('./isnumeric');
 
+var color = module.exports = {};
+
 // IMPORTANT - default colors should be in hex for grid.js
 color.defaults = [
     '#1f77b4', // muted blue

shelly/plotlyjs/static/plotlyjs/src/color.js

@@ -1,9 +1,7 @@
 'use strict';
 
-// ---external global dependencies
-/* global d3:false */
-
 var Plotly = require('./plotly'),
+    d3 = require('d3'),
     isNumeric = require('./isnumeric');
 
 var colorbar = module.exports = function(td, id) {