Merge branch 'master' of https://github.com/plotly/streambed into fix_hang_from_plot_query

Conflicts:
	shelly/plots/views.py

Author: BRONSOLO

shelly/plotlyjs/static/plotlyjs/package.json

@@ -12,6 +12,7 @@
     "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",
@@ -29,7 +30,6 @@
     "ndarray-fill": "^1.0.1",
     "ndarray-homography": "^1.0.0",
     "ndarray-ops": "^1.2.2",
-    "object-assign": "2.0.0",
     "promise": "6.1.0",
     "right-now": "^1.0.0",
     "superscript-text": "^1.0.0",

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

@@ -281,6 +281,8 @@ annotations.layoutAttributes = {
 
     _deprecated: {
         ref: {
+            valType: 'string',
+            role: 'info',
             description: [
                 'Obsolete. Set `xref` and `yref` separately instead.'
             ].join(' ')
@@ -453,7 +455,9 @@ annotations.draw = function(gd, index, opt, value) {
         else if(value==='add' || Plotly.Lib.isPlainObject(value)) {
             fullLayout.annotations.splice(index,0,{});
 
-            var rule = Plotly.Lib.isPlainObject(value) ? $.extend({},value) : {text: 'New text'};
+            var rule = Plotly.Lib.isPlainObject(value) ?
+                    Plotly.Lib.extendFlat({}, value) :
+                    {text: 'New text'};
 
             if (layout.annotations) {
                 layout.annotations.splice(index, 0, rule);

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

@@ -449,6 +449,8 @@ axes.layoutAttributes = {
 
     _deprecated: {
         autotick: {
+            valType: 'boolean',
+            role: 'info',
             description: [
                 'Obsolete.',
                 'Set `tickmode` to *auto* for old `autotick` *true* behavior.',

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

@@ -76,6 +76,9 @@ bars.attributes = {
 
     _deprecated: {
         bardir: {
+            valType: 'enumerated',
+            role: 'info',
+            values: ['v', 'h'],
             description: 'Renamed to `orientation`.'
         }
     }

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

@@ -810,7 +810,7 @@ boxes.hoverPoints = function(pointData, xval, yval, hovermode) {
 
         // copy out to a new object for each value to label
         val = valAxis.c2p(di[attr], true);
-        pointData2 = $.extend({}, pointData);
+        pointData2 = Plotly.Lib.extendFlat({}, pointData);
         pointData2[valLetter+'0'] = pointData2[valLetter+'1'] = val;
         pointData2[valLetter+'LabelVal'] = di[attr];
         pointData2.attr = attr;

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

@@ -496,8 +496,10 @@ var colorbar = module.exports = function(td, id) {
 
             // setter - for multi-part properties,
             // set only the parts that are provided
-            if(Plotly.Lib.isPlainObject(opts[name])) $.extend(opts[name],v);
-            else opts[name] = v;
+            opts[name] = Plotly.Lib.isPlainObject(opts[name]) ?
+                 Plotly.Lib.extendFlat(opts[name], v) :
+                 v;
+
             return component;
         };
     });
@@ -816,9 +818,13 @@ colorbar.traceColorbarAttributes = {
 
     _deprecated: {
         scl: {
+            valType: 'colorscale',
+            role: 'style',
             description: 'Renamed to `colorscale`.'
         },
         reversescl: {
+            valType: 'boolean',
+            role: 'style',
             description: 'Renamed to `reversescale`.'
         }
     }

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

@@ -934,7 +934,7 @@ drawing.bBox = function(node) {
     // remeasure the same thing many times
     var saveNum = node.attributes['data-bb'];
     if(saveNum && saveNum.value) {
-        return $.extend({}, savedBBoxes[saveNum.value]);
+        return Plotly.Lib.extendFlat({}, savedBBoxes[saveNum.value]);
     }
 
     var test3 = d3.select('#js-plotly-tester'),

shelly/plotlyjs/static/plotlyjs/src/errorbars.js

@@ -128,6 +128,8 @@ errorBars.attributes = {
 
     _deprecated: {
         opacity: {
+            valType: 'number',
+            role: 'style',
             description: [
                 'Obsolete.',
                 'Use the alpha channel in error bar `color` to set the opacity.'

shelly/plotlyjs/static/plotlyjs/src/gl3d/attributes/gl3dlayout.js

@@ -135,6 +135,8 @@ module.exports = {
 
     _deprecated: {
         cameraposition: {
+            valType: 'info_array',
+            role: 'info',
             description: 'Obsolete. Use `camera` instead.'
         }
     }

shelly/plotlyjs/static/plotlyjs/src/graph_obj.js

@@ -10,7 +10,8 @@
 
 var Plotly = require('./plotly'),
     m4FromQuat = require('gl-mat4/fromQuat'),
-    isNumeric = require('./isnumeric');
+    isNumeric = require('./isnumeric'),
+    clone = require('clone');
 
 var plots = module.exports = {};
 // Most of the generic plotting functions get put into Plotly.Plots,
@@ -192,24 +193,6 @@ plots.getSubplotData = function getSubplotData(data, type, subplotId) {
     return subplotData;
 };
 
-// new workspace tab. Perhaps this goes elsewhere, a workspace-only file???
-plots.newTab = function(divid, layout) {
-    var gd = document.getElementById(divid);
-    var toolPanel = new Plotly.ToolPanel(Plotly, gd);
-
-    toolPanel.makeMenu();
-
-    var config = {
-        workspace: true,
-        editable: true,
-        autosizable: true,
-        scrollZoom: true,
-        showLink: false,
-        setBackground: 'opaque'
-    };
-    return Plotly.plot(divid, [], layout, config);
-};
-
 // in some cases the browser doesn't seem to know how big
 // the text is at first, so it needs to draw it,
 // then wait a little, then draw it again
@@ -287,7 +270,7 @@ plots.defaultConfig = {
 };
 
 function setPlotContext(gd, config) {
-    if(!gd._context) gd._context = $.extend({}, plots.defaultConfig);
+    if(!gd._context) gd._context = Plotly.Lib.extendFlat(plots.defaultConfig);
     var context = gd._context;
 
     if(config) {
@@ -551,9 +534,6 @@ Plotly.plot = function(gd, data, layout, config) {
     }
     else if(graphwasempty) makePlotFramework(gd);
 
-    // enable or disable formatting buttons
-    $(gd).find('.data-only').attr('disabled', !hasData);
-
     var fullLayout = gd._fullLayout;
 
     // prepare the data and find the autorange
@@ -2240,7 +2220,7 @@ function getExtendProperties (gd, update, indices, maxPoints) {
 }
 
 /**
- * A private function to keey Extend and Prepend traces DRY
+ * A private function to key Extend and Prepend traces DRY
  *
  * @param {Object|HTMLDivElement} gd
  * @param {Object} update
@@ -2590,19 +2570,22 @@ Plotly.moveTraces = function moveTraces (gd, currentIndices, newIndices) {
 
 // restyle: change styling of an existing plot
 // can be called two ways:
-// restyle(gd,astr,val[,traces])
-//      gd - graph div (dom element)
+//
+// restyle(gd, astr, val [,traces])
+//      gd - graph div (string id or dom element)
 //      astr - attribute string (like 'marker.symbol')
 //      val - value to give this attribute
 //      traces - integer or array of integers for the traces
 //          to alter (all if omitted)
-// relayout(gd,aobj[,traces])
+//
+// restyle(gd, aobj [,traces])
 //      aobj - {astr1:val1, astr2:val2...} allows setting
 //          multiple attributes simultaneously
+//
 // val (or val1, val2... in the object form) can be an array,
-//  to apply different values to each trace
-// if the array is too short, it will wrap around (useful for
-//  style files that want to specify cyclical default values)
+// to apply different values to each trace.
+// If the array is too short, it will wrap around (useful for
+// style files that want to specify cyclical default values).
 Plotly.restyle = function restyle(gd, astr, val, traces) {
     gd = getGraphDiv(gd);
 
@@ -3082,9 +3065,9 @@ Plotly.restyle = function restyle(gd, astr, val, traces) {
     var plotDone = Plotly.Lib.syncOrAsync(seq, gd);
 
     if(!plotDone || !plotDone.then) plotDone = Promise.resolve();
+
     return plotDone.then(function(){
-        $(gd).trigger('plotly_restyle',
-                      $.extend(true, [], [redoit, traces]));
+        $(gd).trigger('plotly_restyle', clone([redoit, traces]));
     });
 };
 
@@ -3117,10 +3100,12 @@ function swapXYData(trace) {
 
 // relayout: change layout in an existing plot
 // can be called two ways:
-// relayout(gd,astr,val)
-//      gd - graph div (dom element)
+//
+// relayout(gd, astr, val)
+//      gd - graph div (string id or dom element)
 //      astr - attribute string (like 'xaxis.range[0]')
 //      val - value to give this attribute
+//
 // relayout(gd,aobj)
 //      aobj - {astr1:val1, astr2:val2...}
 //          allows setting multiple attributes simultaneously
@@ -3440,8 +3425,9 @@ Plotly.relayout = function relayout(gd, astr, val) {
     var plotDone = Plotly.Lib.syncOrAsync(seq, gd);
 
     if(!plotDone || !plotDone.then) plotDone = Promise.resolve();
+
     return plotDone.then(function(){
-        $(gd).trigger('plotly_relayout', $.extend(true, {}, redoit));
+        $(gd).trigger('plotly_relayout', clone(redoit));
     });
 };