@progress/kendo-charts 2.7.3-develop.2 → 2.8.0-develop.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -346,9 +346,12 @@ class Chart extends Class {
346
346
 
347
347
  model.renderVisual();
348
348
 
349
- if (this.options.transitions !== false) {
349
+ const transitions = this.options.transitions;
350
+ if (transitions !== false) {
350
351
  model.traverse(function(element) {
351
352
  if (element.animation) {
353
+ const loading = (transitions && transitions !== true) ? transitions.loading : transitions;
354
+ element.animation.options = Object.assign({}, element.animation.options, loading);
352
355
  element.animation.setup();
353
356
  }
354
357
  });
@@ -357,7 +360,7 @@ class Chart extends Class {
357
360
  this._initSurface();
358
361
  this.surface.draw(model.visual);
359
362
 
360
- if (this.options.transitions !== false) {
363
+ if (transitions !== false) {
361
364
  model.traverse(function(element) {
362
365
  if (element.animation) {
363
366
  element.animation.play();
@@ -1926,14 +1929,14 @@ class Chart extends Class {
1926
1929
  let transitionsState;
1927
1930
 
1928
1931
  if (options.transitions !== false) {
1932
+ transitionsState = options.transitions;
1929
1933
  options.transitions = false;
1930
- transitionsState = true;
1931
1934
  }
1932
1935
 
1933
1936
  this._redraw();
1934
1937
 
1935
1938
  if (transitionsState) {
1936
- options.transitions = true;
1939
+ options.transitions = transitionsState;
1937
1940
  }
1938
1941
  }
1939
1942
 
@@ -7,13 +7,14 @@ import { defined } from '../../common';
7
7
  const ClipAnimationMixin = {
8
8
  createAnimation: function() {
9
9
  const root = this.getRoot();
10
- if (root && (root.options || {}).transitions !== false) {
11
- const box = root.size();
10
+ const transitions = ((root && root.options) || {}).transitions;
11
+ if (root && transitions !== false) {
12
+ const box = (this.parent && this.parent.clipBox) || root.size();
12
13
  const clipPath = draw.Path.fromRect(box.toRect());
14
+ const loading = (transitions && transitions !== true) ? transitions.loading : transitions;
13
15
  this.visual.clip(clipPath);
14
- this.animation = new ClipAnimation(clipPath, {
15
- box: box
16
- });
16
+ this.animation = new ClipAnimation(clipPath, Object.assign({}, {box: box},
17
+ loading));
17
18
  if (anyHasZIndex(this.options.series)) {
18
19
  this._setChildrenAnimation(clipPath);
19
20
  }
@@ -346,9 +346,12 @@ class Chart extends Class {
346
346
 
347
347
  model.renderVisual();
348
348
 
349
- if (this.options.transitions !== false) {
349
+ const transitions = this.options.transitions;
350
+ if (transitions !== false) {
350
351
  model.traverse(function(element) {
351
352
  if (element.animation) {
353
+ const loading = (transitions && transitions !== true) ? transitions.loading : transitions;
354
+ element.animation.options = Object.assign({}, element.animation.options, loading);
352
355
  element.animation.setup();
353
356
  }
354
357
  });
@@ -357,7 +360,7 @@ class Chart extends Class {
357
360
  this._initSurface();
358
361
  this.surface.draw(model.visual);
359
362
 
360
- if (this.options.transitions !== false) {
363
+ if (transitions !== false) {
361
364
  model.traverse(function(element) {
362
365
  if (element.animation) {
363
366
  element.animation.play();
@@ -1926,14 +1929,14 @@ class Chart extends Class {
1926
1929
  let transitionsState;
1927
1930
 
1928
1931
  if (options.transitions !== false) {
1932
+ transitionsState = options.transitions;
1929
1933
  options.transitions = false;
1930
- transitionsState = true;
1931
1934
  }
1932
1935
 
1933
1936
  this._redraw();
1934
1937
 
1935
1938
  if (transitionsState) {
1936
- options.transitions = true;
1939
+ options.transitions = transitionsState;
1937
1940
  }
1938
1941
  }
1939
1942
 
@@ -7,13 +7,14 @@ import { defined } from '../../common';
7
7
  const ClipAnimationMixin = {
8
8
  createAnimation: function() {
9
9
  const root = this.getRoot();
10
- if (root && (root.options || {}).transitions !== false) {
11
- const box = root.size();
10
+ const transitions = ((root && root.options) || {}).transitions;
11
+ if (root && transitions !== false) {
12
+ const box = (this.parent && this.parent.clipBox) || root.size();
12
13
  const clipPath = draw.Path.fromRect(box.toRect());
14
+ const loading = (transitions && transitions !== true) ? transitions.loading : transitions;
13
15
  this.visual.clip(clipPath);
14
- this.animation = new ClipAnimation(clipPath, {
15
- box: box
16
- });
16
+ this.animation = new ClipAnimation(clipPath, Object.assign({}, {box: box},
17
+ loading));
17
18
  if (anyHasZIndex(this.options.series)) {
18
19
  this._setChildrenAnimation(clipPath);
19
20
  }