summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-02-10 14:07:33 -0200
committerRenato Botelho <renato@netgate.com>2017-02-10 14:07:41 -0200
commitad1e294ce5a735b680aa9ef93f25906077c8812d (patch)
tree463153406e55f766658bc7b3bcd0d04490d4fb75
parentddd3ffaf490c3d67b5f9ced6acaa3fe277abc9e2 (diff)
downloadpfsense-ad1e294ce5a735b680aa9ef93f25906077c8812d.zip
pfsense-ad1e294ce5a735b680aa9ef93f25906077c8812d.tar.gz
Ticket #7157: Backport upstream fix from https://github.com/novus/nvd3/commit/305cbad96e94f61a3c0bae02d16c28e09249fbc0
-rw-r--r--src/usr/local/www/vendor/nvd3/nv.d3.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/usr/local/www/vendor/nvd3/nv.d3.js b/src/usr/local/www/vendor/nvd3/nv.d3.js
index 149621d..a119b8d 100644
--- a/src/usr/local/www/vendor/nvd3/nv.d3.js
+++ b/src/usr/local/www/vendor/nvd3/nv.d3.js
@@ -1371,6 +1371,8 @@ Also use _d3options so we can track what we inherit for documentation and chaine
*/
nv.utils.inheritOptionsD3 = function(target, d3_source, oplist) {
target._d3options = oplist.concat(target._d3options || []);
+ // Find unique d3 options (string) and update d3options
+ target._d3options = (target._d3options || []).filter(function(item, i, ar){ return ar.indexOf(item) === i; });
oplist.unshift(d3_source);
oplist.unshift(target);
d3.rebind.apply(this, oplist);
@@ -14349,4 +14351,4 @@ nv.models.sunburstChart = function() {
};
nv.version = "1.8.3";
-})(); \ No newline at end of file
+})();
OpenPOWER on IntegriCloud