Fixed #4119, autogenerated series names were incorrect when index was…

… used.
highcharts · Dec 16, 2018 · 5ee60fe · 5ee60fe
1 parent 2608aa2
commit 5ee60fe
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/js/parts/Series.js b/js/parts/Series.js
@@ -2923,7 +2923,7 @@ null
      *         The series name.
      */
     getName: function () {
-        return this.name || 'Series ' + (this.index + 1);
+        return pick(this.options.name, 'Series ' + (this.index + 1)); // #4119
     },
 
     /**

diff --git a/samples/unit-tests/drilldown/across-types/demo.js b/samples/unit-tests/drilldown/across-types/demo.js
@@ -51,6 +51,7 @@ QUnit.test('Drilldown across types', function (assert) {
             drilldown: {
                 series: [{
                     id: 'animals',
+                    name: 'Animals series',
                     data: [
                         ['Cats', 4],
                         ['Dogs', 2],
@@ -87,7 +88,7 @@ QUnit.test('Drilldown across types', function (assert) {
 
     assert.equal(
         chart.series[0].name,
-        'Series 2',
+        'Animals series',
         'Second level name'
     );
 

diff --git a/samples/unit-tests/drilldown/multi-series/demo.js b/samples/unit-tests/drilldown/multi-series/demo.js
@@ -57,6 +57,7 @@ QUnit.test('Drill down on points and categories', function (assert) {
             drilldown: {
                 series: [{
                     id: 'republican-2010',
+                    name: 'republican-2010 series',
                     data: [
                         ['East', 4],
                         ['West', 2],
@@ -129,8 +130,8 @@ QUnit.test('Drill down on points and categories', function (assert) {
     );
     assert.equal(
         chart.series[0].name,
-        'Series 3',
-        'First series name should be `Series 3`'
+        'republican-2010 series',
+        'First series name should be `republican-2010 series`'
     );
 
     // ... and, we're back
@@ -150,8 +151,8 @@ QUnit.test('Drill down on points and categories', function (assert) {
     );
     assert.equal(
         chart.series[0].name,
-        'Series 3',
-        'Name of first series should be `Series 3`'
+        'republican-2010 series',
+        'Name of first series should be `republican-2010 series`'
     );
 
 });
diff --git a/samples/unit-tests/series/index/demo.js b/samples/unit-tests/series/index/demo.js
@@ -1,6 +1,6 @@
 
 
-QUnit.test('Series index and updating (#5960)', function (assert) {
+QUnit.test('Series index and updating', function (assert) {
 
     var chart;
 
@@ -27,7 +27,7 @@ QUnit.test('Series index and updating (#5960)', function (assert) {
     assert.strictEqual(
         getNames(),
         'Series 1, Series 2, Series 3, Series 4, Series 5',
-        'Initial order'
+        'Initial order (#5960)'
     );
 
     chart.series[1].remove();
@@ -37,8 +37,8 @@ QUnit.test('Series index and updating (#5960)', function (assert) {
 
     assert.strictEqual(
         getNames(),
-        'Series 1, Series 5',
-        'Order after remove'
+        'Series 1, Series 2',
+        'Order after remove (#4119)'
     );
 
     chart.addSeries({
@@ -48,8 +48,8 @@ QUnit.test('Series index and updating (#5960)', function (assert) {
 
     assert.strictEqual(
         getNames(),
-        'Series 1, Series 5, New Series',
-        'Order after adding'
+        'Series 1, Series 2, New Series',
+        'Order after adding (#5960 & #4119)'
     );
 });