Skip to content

Commit c9b26de

Browse files
author
pipeline
committed
v19.1.69 is released
1 parent 82e8135 commit c9b26de

File tree

191 files changed

+8414
-487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+8414
-487
lines changed

controls/barcodegenerator/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 19.1.67 (2021-06-08)
5+
## 19.1.63 (2021-05-13)
66

77
### Barcode
88

controls/barcodegenerator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-barcode-generator",
3-
"version": "19.1.56",
3+
"version": "19.1.63",
44
"description": "Barcode generator component is a pure JavaScript library which will convert a string to Barcode and show it to the user. This supports major 1D and 2D barcodes including coda bar, code 128, QR Code.",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

controls/base/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 19.1.67 (2021-06-08)
5+
## 19.1.64 (2021-05-19)
66

77
### Common
88

controls/base/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-base",
3-
"version": "19.1.63",
3+
"version": "19.1.64",
44
"description": "A common package of Essential JS 2 base libraries, methods and class definitions",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

controls/base/styles/definition/_material-dark.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$accent: #00b0ff !default;
1+
$accent: #ff80ab !default;
22
$accent-font: #000 !default;
33
$primary: #3f51b5 !default;
44
$primary-50: #e8eaf6 !default;

controls/charts/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## [Unreleased]
44

5+
## 19.1.69 (2021-06-15)
6+
7+
### Chart
8+
9+
#### Bug Fixes
10+
11+
- `#329311` - Legend text is now rendering properly with ampersand symbol.
12+
513
## 19.1.67 (2021-06-08)
614

715
### Chart

controls/charts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-charts",
3-
"version": "19.1.65",
3+
"version": "19.1.67",
44
"description": "Feature-rich chart control with built-in support for over 25 chart types, technical indictors, trendline, zooming, tooltip, selection, crosshair and trackball.",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

controls/charts/spec/pie/renderer/legend.spec.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,9 @@ describe('Legend checking for the pie series', () => {
666666
let chartContainer: HTMLElement;
667667
let titleElement: Element;
668668
let legendGroup: Element;
669+
let id: string = 'container';
670+
let legendEle: Element;
671+
let legendId: string = id + '_chart_legend';
669672
let backArrow: Element; let fontArrow: Element;
670673
let opacity: string; let path: string;
671674
let xValue: string; let yValue: string;
@@ -966,6 +969,24 @@ describe('Legend checking for the pie series', () => {
966969
pieObj.legendSettings.position = 'Left';
967970
pieObj.refresh();
968971
});
972+
it('11.legend with html entities', (done: Function) => {
973+
pieObj.loaded = (args: IAccLoadedEventArgs) => {
974+
legendEle = getElement(legendId + '_text_1');
975+
expect(legendEle.textContent === '<Serations').toBe(true);
976+
legendEle = getElement(legendId + '_text_4');
977+
expect(legendEle.textContent === 'Prepaid&Assets').toBe(true);
978+
done();
979+
};
980+
pieObj.legendSettings.position = 'Bottom';
981+
pieObj.series[0].dataSource = [{ x: 'Net-s', y: 21, text: '21%' },
982+
{ x: '&#60;Serations', y: 21, text: '21%' },
983+
{ x: 'Privts', y: 8, text: '8%' },
984+
{ x: 'Aler&gt;', y: 8, text: '8%' },
985+
{ x: 'Prepaid&amp;Assets', y: 4, text: '4%' },
986+
{ x: 'St', y: 21, text: '21%' },
987+
{ x: 'Fedeue', y: 16, text: '16%' }];
988+
pieObj.refresh();
989+
});
969990
});
970991
it('memory leak', () => {
971992
profile.sample();

controls/charts/src/accumulation-chart/renderer/legend.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export class AccumulationLegend extends BaseLegend {
9898
name: 'legendRender', cancel: false };
9999
this.chart.trigger('legendRender', legendEventArgs);
100100
legendOption.render = !legendEventArgs.cancel;
101-
legendOption.text = legendEventArgs.text;
101+
legendOption.text = ((legendEventArgs.text.indexOf('&') > -1) ? this.convertHtmlEntities(legendEventArgs.text) : legendEventArgs.text);
102102
legendOption.fill = legendEventArgs.fill;
103103
legendOption.shape = legendEventArgs.shape;
104104
legendOption.textSize = measureText(legendOption.text, legend.textStyle);
@@ -162,6 +162,17 @@ export class AccumulationLegend extends BaseLegend {
162162
this.setBounds(0, 0, legend, legendBounds);
163163
}
164164
}
165+
/**
166+
* To find html entities value for legend
167+
*
168+
* @returns {string} converts the entities to normal string.
169+
*/
170+
public convertHtmlEntities(legendText: string) {
171+
let text = String(legendText).replace('&amp;', '&').replace('&lt;', '<').replace('&gt;', '>').replace('&quot;', '"').replace('&nbsp;', ' ').replace('&cent;', '¢').replace('&pound;', '£').replace('&yen;','¥').replace('&euro;', '€').replace('&copy;','©').replace('&reg;','®');
172+
text = String(text).replace('&#38;', '&').replace('&#60;', '<').replace('&#62;', '>').replace('&#34;', '"').replace('&#160;', ' ').replace('&#162;', '¢').replace('&#163;', '£').replace('&#165;','¥').replace('&#8364;', '€').replace('&#169;','©').replace('&#174;','®');
173+
return text;
174+
}
175+
165176
/**
166177
* To find maximum column size for legend
167178
*

controls/circulargauge/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## [Unreleased]
66

7-
## 19.1.67 (2021-06-08)
7+
## 19.1.69 (2021-06-15)
88

99
### CircularGauge
1010

0 commit comments

Comments
 (0)