From d5b9ec19e2d39575b68d57a54ea667c45aec5ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Ko=C5=82odziej?= Date: Wed, 2 Sep 2020 13:37:32 +0200 Subject: [PATCH] Touch #13711, changed the sample location and variable name. --- js/Extensions/Drilldown.js | 10 +++++----- samples/highcharts/demo/index.htm | 1 - .../demo/organization-drilldown/demo.details | 10 ---------- .../drilldown}/demo.css | 0 .../series-organization/drilldown/demo.details | 6 ++++++ .../drilldown}/demo.html | 0 .../drilldown}/demo.js | 0 ts/Extensions/Drilldown.ts | 10 +++++----- 8 files changed, 16 insertions(+), 21 deletions(-) delete mode 100644 samples/highcharts/demo/organization-drilldown/demo.details rename samples/highcharts/{demo/organization-drilldown => series-organization/drilldown}/demo.css (100%) create mode 100644 samples/highcharts/series-organization/drilldown/demo.details rename samples/highcharts/{demo/organization-drilldown => series-organization/drilldown}/demo.html (100%) rename samples/highcharts/{demo/organization-drilldown => series-organization/drilldown}/demo.js (100%) diff --git a/js/Extensions/Drilldown.js b/js/Extensions/Drilldown.js index 54c5f8ed4fa..7c9c5aa2762 100644 --- a/js/Extensions/Drilldown.js +++ b/js/Extensions/Drilldown.js @@ -406,7 +406,7 @@ defaultOptions.drilldown = { * * @sample {highcharts} highcharts/drilldown/basic/ * Basic drilldown - * @sample {highcharts} highcharts/demo/organization-drilldown + * @sample {highcharts} highcharts/series-organization/drilldown * Organization chart drilldown * * @type {string} @@ -775,14 +775,14 @@ ColumnSeries.prototype.animateDrillupTo = function (init) { syncTimeout(function () { if (newSeries.points) { // May be destroyed in the meantime, #3389 // Unable to drillup with nodes, #13711 - var seriesWithNodes = []; + var pointsWithNodes = []; newSeries.data.forEach(function (el) { - seriesWithNodes.push(el); + pointsWithNodes.push(el); }); if (newSeries.nodes) { - seriesWithNodes = seriesWithNodes.concat(newSeries.nodes); + pointsWithNodes = pointsWithNodes.concat(newSeries.nodes); } - seriesWithNodes.forEach(function (point, i) { + pointsWithNodes.forEach(function (point, i) { // Fade in other points var verb = i === (level && level.pointIndex) ? 'show' : 'fadeIn', inherit = verb === 'show' ? true : void 0, dataLabel = point.dataLabel; if (point.graphic) { // #3407 diff --git a/samples/highcharts/demo/index.htm b/samples/highcharts/demo/index.htm index ff05203d65c..4a5ef068b28 100644 --- a/samples/highcharts/demo/index.htm +++ b/samples/highcharts/demo/index.htm @@ -157,7 +157,6 @@

More chart types

  • Sankey diagram
  • Dependency wheel
  • Organization chart
    • -
  • Organization chart
  • X-range series
  • Word cloud
  • Column pyramid chart
    • diff --git a/samples/highcharts/demo/organization-drilldown/demo.details b/samples/highcharts/demo/organization-drilldown/demo.details deleted file mode 100644 index 95b04eac649..00000000000 --- a/samples/highcharts/demo/organization-drilldown/demo.details +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Organization chart drilldown -authors: - - Torstein Hønsi -js_wrap: b -tags: - - Highcharts demo -categories: - - More chart types -... \ No newline at end of file diff --git a/samples/highcharts/demo/organization-drilldown/demo.css b/samples/highcharts/series-organization/drilldown/demo.css similarity index 100% rename from samples/highcharts/demo/organization-drilldown/demo.css rename to samples/highcharts/series-organization/drilldown/demo.css diff --git a/samples/highcharts/series-organization/drilldown/demo.details b/samples/highcharts/series-organization/drilldown/demo.details new file mode 100644 index 00000000000..7b061cbfd99 --- /dev/null +++ b/samples/highcharts/series-organization/drilldown/demo.details @@ -0,0 +1,6 @@ +--- + name: Highcharts Demo + authors: + - Torstein Hønsi + js_wrap: b +... \ No newline at end of file diff --git a/samples/highcharts/demo/organization-drilldown/demo.html b/samples/highcharts/series-organization/drilldown/demo.html similarity index 100% rename from samples/highcharts/demo/organization-drilldown/demo.html rename to samples/highcharts/series-organization/drilldown/demo.html diff --git a/samples/highcharts/demo/organization-drilldown/demo.js b/samples/highcharts/series-organization/drilldown/demo.js similarity index 100% rename from samples/highcharts/demo/organization-drilldown/demo.js rename to samples/highcharts/series-organization/drilldown/demo.js diff --git a/ts/Extensions/Drilldown.ts b/ts/Extensions/Drilldown.ts index 776dcc1095f..b57a758dfeb 100644 --- a/ts/Extensions/Drilldown.ts +++ b/ts/Extensions/Drilldown.ts @@ -621,7 +621,7 @@ defaultOptions.drilldown = { * * @sample {highcharts} highcharts/drilldown/basic/ * Basic drilldown - * @sample {highcharts} highcharts/demo/organization-drilldown + * @sample {highcharts} highcharts/series-organization/drilldown * Organization chart drilldown * * @type {string} @@ -1122,14 +1122,14 @@ ColumnSeries.prototype.animateDrillupTo = function (init?: boolean): void { syncTimeout(function (): void { if (newSeries.points) { // May be destroyed in the meantime, #3389 // Unable to drillup with nodes, #13711 - var seriesWithNodes: Array = []; + var pointsWithNodes: Array = []; newSeries.data.forEach(function (el): void { - seriesWithNodes.push(el); + pointsWithNodes.push(el); }); if (newSeries.nodes) { - seriesWithNodes = seriesWithNodes.concat(newSeries.nodes); + pointsWithNodes = pointsWithNodes.concat(newSeries.nodes); } - seriesWithNodes.forEach(function ( + pointsWithNodes.forEach(function ( point: Point, i: number ): void {