Merge pull request #4273 from plotly/PlotlyPromisePolyfill

Plotly promise polyfill

Author: bpostlethwaite

shelly/plotlyjs/static/plotlyjs/package.json

@@ -15,6 +15,7 @@
     "convex-hull": "^1.0.3",
     "d3": "3.3.5",
     "delaunay-triangulate": "^1.1.6",
+    "es6-promise": "^3.0.2",
     "gl-error3d": "^1.0.0",
     "gl-line3d": "^1.0.1",
     "gl-mat4": "^1.1.2",
@@ -28,7 +29,6 @@
     "ndarray-fill": "^1.0.1",
     "ndarray-homography": "^1.0.0",
     "ndarray-ops": "^1.2.2",
-    "promise": "6.1.0",
     "right-now": "^1.0.0",
     "superscript-text": "^1.0.0",
     "through2": "^2.0.0",

shelly/plotlyjs/static/plotlyjs/src/plotly.js

@@ -1,3 +1,5 @@
+require('es6-promise').polyfill();
+
 // order of requires should matter only for interdependencies
 // in attributes definitions. put the common modules first
 exports.Lib = require('./lib/lib');
@@ -58,9 +60,5 @@ exports.Snapshot = require('./snapshot/snapshot');
 // Queue for undo/redo
 exports.Queue = require('./queue');
 
-// promise polyfill, embed rather than requiring dependencies
-require('../../../../shelly/static/js/plugins/promise-1.0.0.min.js');
-require('../../../../shelly/static/js/plugins/promise-done-1.0.0.js');
-
 // exports d3 used in the bundle
 exports.d3 = require('d3');