Merge branch 'master' into doeg-buttonz

Author: NicoleMGF

image_server/test/mocks/polar_line.json

@@ -693,7 +693,7 @@
       "size": 12,
       "color": "#000"
     },
-    "showlegend": false,
+    "showlegend": true,
     "width": 500,
     "height": 400,
     "margin": {

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

@@ -12,11 +12,8 @@
     "alpha-shape": "^1.0.0",
     "arraytools": "^1.0.0",
     "browserify": "^6.1.0",
-    "clone": "^1.0.2",
-    "colormap": "^1.3.1",
     "convex-hull": "^1.0.3",
     "delaunay-triangulate": "^1.1.6",
-    "extend": "^3.0.0",
     "gl-error3d": "^1.0.0",
     "gl-line3d": "^1.0.1",
     "gl-mat4": "^1.1.2",

shelly/plotlyjs/static/plotlyjs/package.json

@@ -77,7 +77,7 @@ annotations.layoutAttributes = {
             'with respect to the horizontal.'
         ].join(' ')
     },
-    font: Plotly.Lib.extendFlat(Plotly.Plots.fontAttrs, {
+    font: Plotly.Lib.extendFlat({}, Plotly.Plots.fontAttrs, {
         description: 'Sets the annotation text font.'
     }),
     opacity: {

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

@@ -42,7 +42,7 @@ axes.layoutAttributes = {
         role: 'info',
         description: 'Sets the title of this axis.'
     },
-    titlefont: extendFlat(Plotly.Plots.fontAttrs, {
+    titlefont: extendFlat({}, Plotly.Plots.fontAttrs, {
         description: [
             'Sets this axis\' title font.'
         ].join(' ')
@@ -216,7 +216,7 @@ axes.layoutAttributes = {
         role: 'style',
         description: 'Determines whether or not the tick labels are drawn.'
     },
-    tickfont: extendFlat(Plotly.Plots.fontAttrs, {
+    tickfont: extendFlat({}, Plotly.Plots.fontAttrs, {
         description: 'Sets the tick font.'
     }),
     tickangle: {
@@ -319,7 +319,7 @@ axes.layoutAttributes = {
         role: 'style',
         description: [
             'Determines whether or not a line bounding this axis is drawn.'
-        ]
+        ].join(' ')
     },
     linecolor: {
         valType: 'color',

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

@@ -140,18 +140,18 @@ boxes.attributes = {
             role: 'style',
             description: 'Sets the color of the outlier sample points.'
         },
-        symbol: extendFlat(scatterMarkerAttrs.symbol,
+        symbol: extendFlat({}, scatterMarkerAttrs.symbol,
             {arrayOk: false}),
-        opacity: extendFlat(scatterMarkerAttrs.opacity,
+        opacity: extendFlat({}, scatterMarkerAttrs.opacity,
             {arrayOk: false, dflt: 1}),
-        size: extendFlat(scatterMarkerAttrs.size,
+        size: extendFlat({}, scatterMarkerAttrs.size,
             {arrayOk: false}),
-        color: extendFlat(scatterMarkerAttrs.color,
+        color: extendFlat({}, scatterMarkerAttrs.color,
             {arrayOk: false}),
         line: {
-            color: extendFlat(scatterMarkerLineAttrs.color,
+            color: extendFlat({}, scatterMarkerLineAttrs.color,
                 {arrayOk: false, dflt: Plotly.Color.defaultLine}),
-            width: extendFlat(scatterMarkerLineAttrs.width,
+            width: extendFlat({}, scatterMarkerLineAttrs.width,
                 {arrayOk: false, dflt: 0}),
             outliercolor: {
                 valType: 'color',

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

@@ -351,7 +351,7 @@ var colorbar = module.exports = function(td, id) {
 
             cbAxisOut._pos = xLeft+thickPx +
                 (opts.outlinewidth||0)/2 - (opts.ticks==='outside' ? 1 : 0);
-            cbAxisOut.side = opts.orient;
+            cbAxisOut.side = 'right';
 
             return Plotly.Axes.doTicks(td, cbAxisOut);
         }
@@ -525,14 +525,17 @@ var axesAttrs = Plotly.Axes.layoutAttributes,
     extendFlat = Plotly.Lib.extendFlat;
 
 colorbar.attributes = {
-    orient: {
-        // which side are the labels on (so left and right make vertical bars, etc.)
-        // TODO: only right is supported currently
-        valType: 'enumerated',
-        role: 'info',
-        values: ['left', 'right', 'top', 'bottom'],
-        dflt: 'right'
-    },
+// TODO: only right is supported currently
+//     orient: {
+//         valType: 'enumerated',
+//         role: 'info',
+//         values: ['left', 'right', 'top', 'bottom'],
+//         dflt: 'right',
+//         description: [
+//             'Determines which side are the labels on',
+//             '(so left and right make vertical bars, etc.)'
+//         ].join(' ')
+//     },
     thicknessmode: {
         valType: 'enumerated',
         values: ['fraction', 'pixels'],
@@ -659,7 +662,7 @@ colorbar.attributes = {
     dtick: axesAttrs.dtick,
     tickvals: axesAttrs.tickvals,
     ticktext: axesAttrs.ticktext,
-    ticks: extendFlat(axesAttrs.ticks, {dflt: ''}),
+    ticks: extendFlat({}, axesAttrs.ticks, {dflt: ''}),
     ticklen: axesAttrs.ticklen,
     tickwidth: axesAttrs.tickwidth,
     tickcolor: axesAttrs.tickcolor,
@@ -679,7 +682,7 @@ colorbar.attributes = {
         dflt: 'Click to enter colorscale title',
         description: 'Sets the title of the color bar.'
     },
-    titlefont: extendFlat(Plotly.Plots.fontAttrs, {
+    titlefont: extendFlat({}, Plotly.Plots.fontAttrs, {
         description: [
             'Sets this color bar\'s title font.'
         ].join(' ')
@@ -688,7 +691,11 @@ colorbar.attributes = {
         valType: 'enumerated',
         values: ['right', 'top', 'bottom'],
         role: 'style',
-        dflt: 'top'
+        dflt: 'top',
+        description: [
+            'Determines the location of the colorbar title',
+            'with respect to the color bar.'
+        ].join(' ')
     }
 };
 
@@ -701,8 +708,6 @@ colorbar.supplyDefaults = function(containerIn, containerOut, layout) {
                                  colorbar.attributes, attr, dflt);
     }
 
-    coerce('orient');
-
     var thicknessmode = coerce('thicknessmode');
     coerce('thickness', thicknessmode === 'fraction' ?
         30 / (layout.width - layout.margin.l - layout.margin.r) :

shelly/plotlyjs/static/plotlyjs/src/colorbar.js

@@ -103,15 +103,15 @@ contour.attributes = {
         }
     },
     line: {
-        color: extendFlat(scatterLineAttrs.color, {
+        color: extendFlat({}, scatterLineAttrs.color, {
             description: [
                 'Sets the color of the contour level.',
                 'Has no if `contours.coloring` is set to *lines*.'
             ].join(' ')
         }),
         width: scatterLineAttrs.width,
         dash: scatterLineAttrs.dash,
-        smoothing: extendFlat(scatterLineAttrs.smoothing, {
+        smoothing: extendFlat({}, scatterLineAttrs.smoothing, {
             description: [
                 'Sets the amount of smoothing for the contour lines,',
                 'where *0* corresponds to no smoothing.'

shelly/plotlyjs/static/plotlyjs/src/contour.js

@@ -973,7 +973,7 @@ drawing.bBox = function(node) {
     node.setAttribute('data-bb',savedBBoxes.length);
     savedBBoxes.push(bb);
 
-    return Plotly.Lib.extendFlat(bb);
+    return Plotly.Lib.extendFlat({}, bb);
 };
 
 /*

shelly/plotlyjs/static/plotlyjs/src/drawing.js

@@ -34,7 +34,7 @@ module.exports = {
     autocolorscale: traceColorbarAttrs.autocolorscale,
     reversescale: traceColorbarAttrs.reversescale,
     showscale: traceColorbarAttrs.showscale,
-    hoverinfo: Plotly.Lib.extendFlat(Plotly.Plots.attributes.hoverinfo, {
+    hoverinfo: Plotly.Lib.extendFlat({}, Plotly.Plots.attributes.hoverinfo, {
         flags: ['location', 'z', 'text', 'name']
     }),
     _nestedModules: {