Merge pull request #3893 from plotly/rm-jquery-extend

Replace jQuery extend

Author: etpinard

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

@@ -455,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/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;
         };
     });

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/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,
@@ -290,7 +291,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) {
@@ -554,9 +555,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
@@ -2243,7 +2241,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
@@ -2593,19 +2591,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);
 
@@ -3085,9 +3086,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]));
     });
 };
 
@@ -3120,10 +3121,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
@@ -3443,8 +3446,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));
     });
 };
 

shelly/plotlyjs/static/plotlyjs/src/heatmap.js

@@ -1137,7 +1137,7 @@ heatmap.hoverPoints = function(pointData, xval, yval, hovermode, contour) {
         text = trace.text[ny][nx];
     }
 
-    return [$.extend(pointData,{
+    return [Plotly.Lib.extendFlat(pointData, {
         index: [ny, nx],
         // never let a 2D override 1D type as closest point
         distance: Plotly.Fx.MAXDIST+10,

shelly/plotlyjs/static/plotlyjs/src/lib.js

@@ -1701,9 +1701,9 @@ lib.mergeArray = function(traceAttr, cd, cdAttr) {
 };
 
 /**
- * modified version of $.extend to strip out private objs and functions,
+ * modified version of jQuery's extend to strip out private objs and functions,
  * and cut arrays down to first <arraylen> or 1 elements
- * because $.extend is hella slow
+ * because extend-like algorithms are hella slow
  * obj2 is assumed to already be clean of these things (including no arrays)
  */
 lib.minExtend = function(obj1, obj2) {

shelly/plotlyjs/static/plotlyjs/src/plotschema.js

@@ -1,7 +1,9 @@
 'use strict';
 
 var Plotly = require('./plotly'),
-    objectAssign = require('object-assign');
+    clone = require('clone');
+
+var extendFlat = Plotly.Lib.extendFlat;
 
 var NESTED_MODULE = '_nestedModules',
     COMPOSED_MODULE = '_composedModules',
@@ -24,6 +26,7 @@ var polarAreaAttrs = require('./polar/attributes/area'),
 
 var PlotSchema = module.exports = {};
 
+
 PlotSchema.get =  function() {
     Plotly.Plots.allTypes
         .concat('area')  // FIXME polar 'area' attributes
@@ -69,19 +72,19 @@ function getTraceAttributes(type) {
 
     // subplot attributes
     if(subplotRegistry.attributes !== undefined) {
-        attributes = objectAssign(attributes, subplotRegistry.attributes);
+        attributes = extendFlat(attributes, clone(subplotRegistry.attributes));
     }
 
     // global attributes (same for all trace types)
-    attributes = objectAssign(attributes, globalAttributes);
+    attributes = extendFlat(attributes, clone(globalAttributes));
 
     // 'type' gets overwritten by globalAttributes; reset it here
     attributes.type = type;
 
     attributes = removeUnderscoreAttrs(attributes);
 
     mergeValTypeAndRole(attributes);
-    plotSchema.traces[type] = objectAssign(
+    plotSchema.traces[type] = extendFlat(
         meta,
         { attributes: attributes }
     );
@@ -152,7 +155,7 @@ function coupleAttrs(attrsIn, attrsOut, whichAttrs, type) {
                 );
 
                 Plotly.Lib.nestedProperty(attrsOut, kk)
-                    .set(nestedReference);
+                    .set(clone(nestedReference));
             });
             return;
         }
@@ -169,14 +172,12 @@ function coupleAttrs(attrsIn, attrsOut, whichAttrs, type) {
                     composedAttrs, {}, whichAttrs, type
                 );
 
-                attrsOut = objectAssign(attrsOut, composedAttrs);
+                attrsOut = extendFlat(attrsOut, clone(composedAttrs));
             });
             return;
         }
 
-        attrsOut[k] = Plotly.Lib.isPlainObject(attrsIn[k]) ?
-            objectAssign({}, attrsIn[k]) :
-            attrsIn[k];  // some underscore attributes are booleans
+        attrsOut[k] = clone(attrsIn[k]);
     });
 
     return attrsOut;
@@ -242,12 +243,12 @@ function getMeta(type) {
 }
 
 function assignPolarLayoutAttrs(layoutAttributes) {
-    layoutAttributes = objectAssign(layoutAttributes, {
-        radialaxis: polarAxisAttrs.radialaxis,
-        angularaxis: polarAxisAttrs.angularaxis
+    layoutAttributes = extendFlat(layoutAttributes, {
+        radialaxis: clone(polarAxisAttrs.radialaxis),
+        angularaxis: clone(polarAxisAttrs.angularaxis)
     });
 
-    layoutAttributes = objectAssign(layoutAttributes, polarAxisAttrs.layout);
+    layoutAttributes = extendFlat(layoutAttributes, clone(polarAxisAttrs.layout));
 
     return layoutAttributes;  // FIXME
 }

shelly/plotlyjs/static/plotlyjs/src/queue.js

@@ -1,43 +1,6 @@
 'use strict';
 
-/**
- * Copy arg array *without* removing `undefined` values from objects.
- *
- * `$.extend(true, *, *)` ignores `undefined` object properties, which we
- * depend on in relayout and restyle. This function exists *purely* to
- * conserve these undefined properties.
- *
- * Note, it doesn't bother with undefined properties inside an object in
- * an array. We don't have a use-case for this, so it doesn't matter.
- *
- * @param gd
- * @param args
- * @returns {Array}
- */
-function copyArgArray (gd, args) {
-    var copy = [],
-        i,
-        arg,
-        ai;
-    for (i = 0; i < args.length; i++) {
-        arg = args[i];
-        if (arg === gd) {
-            copy[i] = arg;
-        } else if (typeof arg === 'object') {
-            if (Array.isArray(arg)) {
-                copy[i] = $.extend(true, [], arg);
-            } else {
-                copy[i] = {};
-
-                // this is the important line! `undefined` things are kept!
-                for(ai in arg) copy[i][ai] = arg[ai];
-            }
-        } else {
-            copy[i] = arg;
-        }
-    }
-    return copy;
-}
+var clone = require('clone');
 
 
 // -----------------------------------------------------
@@ -124,7 +87,8 @@ queue.undo = function undo (gd) {
     var queueObj,
         i;
 
-    if (!gd) { gd = Tabs.get(); }
+    if(!gd) gd = Tabs.get();  // FIXME
+
     if(gd.framework && gd.framework.isPolar){
         gd.framework.undo();
         return;
@@ -159,7 +123,8 @@ queue.redo = function redo (gd) {
     var queueObj,
         i;
 
-    if (!gd) { gd = Tabs.get(); }
+    if(!gd) gd = Tabs.get();  // FIXME
+
     if(gd.framework && gd.framework.isPolar){
         gd.framework.redo();
         return;
@@ -197,11 +162,8 @@ queue.redo = function redo (gd) {
 queue.plotDo = function (gd, func, args) {
     gd.autoplay = true;
 
-    // this *won't* copy gd and it preserves `undefined` properties!
-    args = copyArgArray(gd, args);
-
-    // call the supplied function
-    func.apply(null, args);
+    // call the supplied function with a cloned args
+    func.apply(null, clone(args));
 };
 
 module.exports = queue;