Skip to content

Commit ce5401d

Browse files
author
pipeline
committed
v17.2.40 is released
1 parent c1562fc commit ce5401d

File tree

487 files changed

+16802
-2493
lines changed

Some content is hidden

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

487 files changed

+16802
-2493
lines changed

controls/base/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## [Unreleased]
44

5+
## 17.2.40 (2019-08-06)
6+
7+
### Common
8+
9+
#### Bug Fixes
10+
11+
- `#I240696` - Resolved drag issue for actual drag element for scrolled parent element.
12+
513
## 17.2.39 (2019-07-30)
614

715
### Common

controls/base/dist/ej2-base.umd.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/base/dist/ej2-base.umd.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/base/dist/es6/ej2-base.es2015.js

+21-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/base/dist/es6/ej2-base.es2015.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/base/dist/es6/ej2-base.es5.js

+21-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/base/dist/es6/ej2-base.es5.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/base/dist/global/ej2-base.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/base/dist/global/ej2-base.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/base/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-base",
3-
"version": "17.2.35",
3+
"version": "17.2.39",
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/spec/template.spec.ts

+23-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,22 @@ import { createElement} from '../src/dom';
44
* Template Engine Spec
55
*/
66

7-
let specialCharValue = [{'@ShipCountry': 'France'}];
7+
let arrayOfObj = [
8+
{
9+
"IDPRATICA": 700,
10+
"Giorni": [
11+
{
12+
"Data": "2019-05-01T00:00:00",
13+
"IDSTATO": 99,
14+
},
15+
{
16+
"Data": "2019-05-02T00:00:00",
17+
"IDSTATO": 99,
18+
}
19+
]
20+
}
21+
];
22+
let specialCharValue = [{'@ShipCountry': 'France'}];
823
let dsJSONArray: any = [{ name: 'one', info: { id: '01' } }, { name: 'two', info: { id: '02' } }];
924
let dsSubArray: any = [{ name: 'one', items: ['AR Item1', 'AR Item2'] }, { name: 'two', items: ['AR Item1', 'AR Item2'] }];
1025
let dsJSONSubArray: any = [{ name: 'one', info: { id: '01', items: ['AR Item1', 'AR Item2'] } }, { name: 'two', info: { id: '02', items: ['AR Item1', 'AR Item2'] } }];
@@ -49,6 +64,13 @@ describe('Template', () => {
4964
result.push(createElement('div', { innerHTML: 'France' }));
5065
expect(outDOM(template.compile(templateStr), specialCharValue)).toEqual(result);
5166
});
67+
68+
it('JSON Array Input With Template String with array of value within object', () => {
69+
let templateStr: string = '${if(Giorni[0].IDSTATO==99)}<div>true</div>${else}<div>false</div>${/if}';
70+
let result: Element[] = [];
71+
result.push(createElement('div', { innerHTML: 'true' }));
72+
expect(outDOM(template.compile(templateStr), arrayOfObj)).toEqual(result);
73+
});
5274

5375
it('JSON Array Input With two space between class Names', () => {
5476
let templateStr: string = '<div class="class1 class2 class3">${name}</div>';

controls/base/src/draggable.ts

+9-4
Original file line numberDiff line numberDiff line change
@@ -385,10 +385,15 @@ export class Draggable extends Base<HTMLElement> implements INotifyPropertyChang
385385
this.initialPosition = { x: intCoord.pageX, y: intCoord.pageY };
386386
if (!this.clone) {
387387
let pos: PositionModel = this.element.getBoundingClientRect();
388-
let verticalScrollParent: HTMLElement = this.getScrollableParent(this.element.parentNode as HTMLElement, 'vertical');
389-
let horizontalScrollParent: HTMLElement = this.getScrollableParent(this.element.parentNode as HTMLElement, 'horizontal');
390-
let parentScrollX: number = horizontalScrollParent ? horizontalScrollParent.scrollLeft : 0;
391-
let parentScrollY: number = verticalScrollParent ? verticalScrollParent.scrollTop : 0;
388+
let isModalDialog: boolean = this.element.classList.contains('e-dialog') && this.element.classList.contains('e-dlg-modal');
389+
let parentScrollX: number = 0;
390+
let parentScrollY: number = 0;
391+
if (!isModalDialog) {
392+
let verticalScrollParent: HTMLElement = this.getScrollableParent(this.element.parentNode as HTMLElement, 'vertical');
393+
let horizontalScrollParent: HTMLElement = this.getScrollableParent(this.element.parentNode as HTMLElement, 'horizontal');
394+
parentScrollX = horizontalScrollParent ? horizontalScrollParent.scrollLeft : 0;
395+
parentScrollY = verticalScrollParent ? verticalScrollParent.scrollTop : 0;
396+
}
392397
this.relativeXPosition = intCoord.pageX - (pos.left + parentScrollX);
393398
this.relativeYPosition = intCoord.pageY - (pos.top + parentScrollY);
394399
}

controls/base/src/template.ts

+12-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const DBL_QUOTED_STR: RegExp = new RegExp('"(.*?)"', 'g');
1616
const SPECIAL_CHAR: RegExp = /\@|\#|\$/g;
1717
let exp: RegExp = new RegExp('\\${([^}]*)}', 'g');
1818
// let cachedTemplate: Object = {};
19-
19+
let ARR_OBJ: RegExp = /^\..*/gm;
2020

2121
/**
2222
* The function to set regular expression for template expression string.
@@ -102,7 +102,11 @@ function evalExp(str: string, nameSpace: string, helper?: Object): string {
102102
//handling if condition
103103
cnt = '"; ' + cnt.replace(matches[1], rlStr.replace(WORD, (strs: string): string => {
104104
strs = strs.trim();
105-
return addNameSpace(strs, !(QUOTES.test(strs)) && (localKeys.indexOf(strs) === -1), nameSpace, localKeys);
105+
if (ARR_OBJ.test(strs)) {
106+
return NameSpaceArrObj(strs, !(QUOTES.test(strs)) && (localKeys.indexOf(strs) === -1), nameSpace, localKeys);
107+
} else {
108+
return addNameSpace(strs, !(QUOTES.test(strs)) && (localKeys.indexOf(strs) === -1), nameSpace, localKeys);
109+
}
106110
})) + '{ \n str = str + "';
107111
} else if (FOR_STMT.test(cnt)) {
108112

@@ -164,6 +168,12 @@ function addNameSpace(str: string, addNS: Boolean, nameSpace: string, ignoreList
164168
return ((addNS && !(NOT_NUMBER.test(str)) && ignoreList.indexOf(str.split('.')[0]) === -1) ? nameSpace + '.' + str : str);
165169
}
166170

171+
function NameSpaceArrObj(str: string, addNS: Boolean, nameSpace: string, ignoreList: string[]): string {
172+
let arrObjReg: RegExp = /^\..*/gm;
173+
return ((addNS && !(NOT_NUMBER.test(str)) &&
174+
ignoreList.indexOf(str.split('.')[0]) === -1 && !(arrObjReg.test(str))) ? nameSpace + '.' + str : str);
175+
}
176+
167177
// // Create hashCode for template string to storeCached function
168178
// function hashCode(str: string): string {
169179
// return str.split('').reduce((a: number, b: string) => { a = ((a << 5) - a) + b.charCodeAt(0); return a & a; }, 0).toString();

controls/charts/dist/ej2-charts.umd.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/charts/dist/ej2-charts.umd.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/charts/dist/es6/ej2-charts.es2015.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -34819,7 +34819,7 @@ __decorate$20([
3481934819
Property(null)
3482034820
], RangeBandSettings.prototype, "color", void 0);
3482134821
__decorate$20([
34822-
Property(null)
34822+
Property(1)
3482334823
], RangeBandSettings.prototype, "opacity", void 0);
3482434824
/**
3482534825
* To configure the sparkline axis
@@ -36378,6 +36378,7 @@ let Sparkline = class Sparkline extends Component {
3637836378
case 'axisSettings':
3637936379
case 'type':
3638036380
case 'valueType':
36381+
case 'enableRtl':
3638136382
refresh = true;
3638236383
break;
3638336384
case 'border':

controls/charts/dist/es6/ej2-charts.es2015.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/charts/dist/es6/ej2-charts.es5.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -37134,7 +37134,7 @@ var RangeBandSettings = /** @__PURE__ @class */ (function (_super) {
3713437134
Property(null)
3713537135
], RangeBandSettings.prototype, "color", void 0);
3713637136
__decorate$20([
37137-
Property(null)
37137+
Property(1)
3713837138
], RangeBandSettings.prototype, "opacity", void 0);
3713937139
return RangeBandSettings;
3714037140
}(ChildProperty));
@@ -38777,6 +38777,7 @@ var Sparkline = /** @__PURE__ @class */ (function (_super) {
3877738777
case 'axisSettings':
3877838778
case 'type':
3877938779
case 'valueType':
38780+
case 'enableRtl':
3878038781
refresh = true;
3878138782
break;
3878238783
case 'border':

controls/charts/dist/es6/ej2-charts.es5.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/charts/dist/global/ej2-charts.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/charts/dist/global/ej2-charts.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/charts/src/sparkline/model/base-model.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ export interface RangeBandSettingsModel {
200200

201201
/**
202202
* To configure sparkline rangeband opacity
203-
* @aspDefaultValueIgnore
203+
* @default 1
204204
*/
205205
opacity?: number;
206206

controls/charts/src/sparkline/model/base.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ export class RangeBandSettings extends ChildProperty<RangeBandSettings> {
201201
public color: string;
202202
/**
203203
* To configure sparkline rangeband opacity
204-
* @aspDefaultValueIgnore
204+
* @default 1
205205
*/
206-
@Property(null)
206+
@Property(1)
207207
public opacity: number;
208208
}
209209
/**

controls/charts/src/sparkline/sparkline.ts

+1
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,7 @@ export class Sparkline extends Component<HTMLElement> implements INotifyProperty
733733
case 'axisSettings':
734734
case 'type':
735735
case 'valueType':
736+
case 'enableRtl':
736737
refresh = true;
737738
break;
738739
case 'border':

controls/circulargauge/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-circulargauge",
3-
"version": "17.2.36",
3+
"version": "17.2.39",
44
"description": "Essential JS 2 CircularGauge Components",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

controls/data/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 17.2.39 (2019-07-30)
5+
## 17.2.40 (2019-08-06)
66

77
### DataManager
88

controls/diagrams/dist/ej2-diagrams.umd.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controls/diagrams/dist/ej2-diagrams.umd.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)