Skip to content

Commit 79a532d

Browse files
author
pipeline
committed
v17.3.19 is released
1 parent 4c896b3 commit 79a532d

File tree

404 files changed

+9413
-2141
lines changed

Some content is hidden

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

404 files changed

+9413
-2141
lines changed

controls/base/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+
## 17.3.16 (2019-10-09)
6+
7+
### Common
8+
9+
#### Bug Fixes
10+
11+
- `#243640` - Resolved Template support for helper function in if/else condition.
12+
513
## 17.3.14 (2019-10-03)
614

715
### Common

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 17 additions & 27 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 17 additions & 27 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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": "17.3.14",
3+
"version": "17.3.16",
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/component.spec.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { Property, Complex, NotifyPropertyChanges, INotifyPropertyChanged, Event
1010
import { Touch } from '../src/touch';
1111
import { enableRtl, setCulture } from '../src/internationalization';
1212
import { setCurrencyCode } from '../src/index';
13-
import * as Util from '../src/util';
1413
//classes
1514

1615

@@ -870,7 +869,6 @@ describe('Component', () => {
870869
});
871870
it(' - after component render', () => {
872871
window['Blazor'] = {};
873-
Util.enableBlazorMode();
874872
window['ejsInterop'] = {
875873
childSaveChanges: function (wrapper: any) {
876874
return wrapper;
@@ -888,7 +886,6 @@ describe('Component', () => {
888886
obj.renderComplete(wrapper);
889887
obj.fields.name = 'childchange';
890888
expect(curSpy).toHaveBeenCalled();
891-
Util.disableBlazorMode();
892889
delete window['Blazor'];
893890
delete window['ejsInterop'];
894891
});

controls/base/spec/intl/date-parser.spec.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -876,4 +876,10 @@ describe('DateParser', () => {
876876
});
877877
})
878878
});
879+
describe('EJ2-30137 Case insensitive date returns proper value',() => {
880+
it('Case insensitive date returns proper value',()=>{
881+
let iFormatter: Date = DateParser.dateParser('en', { format:'dd MMM,yyyy' }, cldrData)('01 aug,2019');
882+
expect(iFormatter).not.toBeNull();
883+
});
884+
})
879885
});

controls/base/spec/template.spec.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ let tempObj: any;
4040

4141
interface MyWindow extends Window {
4242
getName: Function;
43+
check: Function;
4344
custom : String;
4445
}
4546

@@ -343,5 +344,19 @@ describe('Template', () => {
343344
let output: any = getDOMString(data);
344345
expect(output).toEqual("<div>ASTONHIMARTIN</div>");
345346
});
347+
it('JSON Array Input with IF Condition which has window function', () => {
348+
window.check = function (args: number) {
349+
if(args % 2 == 0) {
350+
return true;
351+
}
352+
else {
353+
return false;
354+
}
355+
}
356+
let templateStr: string = '${if(window.check(IDPRATICA))}<div>true</div>${else}<div>false</div>${/if}';
357+
let result: Element[] = [];
358+
result.push(createElement('div', { innerHTML: 'true' }));
359+
expect(outDOM(template.compile(templateStr), arrayOfObj)).toEqual(result);
360+
});
346361

347362
});

controls/base/spec/util.spec.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,8 @@ describe('Util', () => {
252252
});
253253

254254
it('isBlazor true', () => {
255-
Util.enableBlazorMode();
256255
window['Blazor'] = {};
257256
expect(Util.isBlazor()).toBe(true);
258-
Util.disableBlazorMode();
259257
});
260258

261259
it('GetElement with element', () => {
@@ -265,7 +263,6 @@ describe('Util', () => {
265263
});
266264
it('GetElement with xpath', () => {
267265
window['Blazor'] = {};
268-
Util.enableBlazorMode();
269266
var element = document.createElement('span');
270267
element.id = "xpathelement";
271268
document.body.appendChild(element);
@@ -274,7 +271,6 @@ describe('Util', () => {
274271
}
275272
expect(Util.getElement(eleObj)).toBe(element);
276273
document.body.innerHTML = "";
277-
Util.disableBlazorMode();
278274
});
279275
function createXPathFromElement (elm: any): any {
280276
var allNodes = document.getElementsByTagName('*');

controls/base/src/intl/date-parser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ export class DateParser {
173173
parseOptions.evalposition[charKey] = { isNumber: isNumber, pos: i + 1 + gmtCorrection, hourOnly: hourOnly };
174174
}
175175
if (i === length - 1 && !isNullOrUndefined(regexString)) {
176-
parseOptions.parserRegex = new RegExp('^' + regexString + '$');
176+
parseOptions.parserRegex = new RegExp('^' + regexString + '$', 'i');
177177
}
178178
}
179179
}

controls/base/src/template.ts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,20 @@ function evalExp(str: string, nameSpace: string, helper?: Object): string {
105105
//handling if condition
106106
cnt = '"; ' + cnt.replace(matches[1], rlStr.replace(WORDIF, (strs: string): string => {
107107
strs = strs.trim();
108-
let regExAt: RegExp = /\@|\$|\#/gm;
109-
if (regExAt.test(strs)) {
110-
strs = NameSpaceForspecialChar(strs, (localKeys.indexOf(strs) === -1), nameSpace, localKeys) + '"]';
111-
}
112-
if (ARR_OBJ.test(strs)) {
113-
return NameSpaceArrObj(strs, !(QUOTES.test(strs)) && (localKeys.indexOf(strs) === -1), nameSpace, localKeys);
108+
let funcRegExp: RegExp = /\window./gm;
109+
if (!funcRegExp.test(strs)) {
110+
let regExAt: RegExp = /\@|\$|\#/gm;
111+
if (regExAt.test(strs)) {
112+
strs = NameSpaceForspecialChar(strs, (localKeys.indexOf(strs) === -1), nameSpace, localKeys) + '"]';
113+
}
114+
if (ARR_OBJ.test(strs)) {
115+
// tslint:disable-next-line
116+
return NameSpaceArrObj(strs, !(QUOTES.test(strs)) && (localKeys.indexOf(strs) === -1), nameSpace, localKeys);
117+
} else {
118+
return addNameSpace(strs, !(QUOTES.test(strs)) && (localKeys.indexOf(strs) === -1), nameSpace, localKeys);
119+
}
114120
} else {
115-
return addNameSpace(strs, !(QUOTES.test(strs)) && (localKeys.indexOf(strs) === -1), nameSpace, localKeys);
121+
return strs;
116122
}
117123
})) + '{ \n str = str + "';
118124
} else if (FOR_STMT.test(cnt)) {

controls/base/src/util.ts

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@ declare let window: {
1010
msCrypto: Crypto;
1111
} & Window;
1212
let uid: number = 0;
13-
let isBlazorPlatform: boolean = false;
14-
15-
/**
16-
* Function to check whether the platform is blazor or not.
17-
* @return {boolean} result
18-
* @private
19-
*/
20-
export function disableBlazorMode(): void {
21-
isBlazorPlatform = false;
22-
}
2313

2414
/**
2515
* Create Instance from constructor function with desired parameters.
@@ -355,22 +345,13 @@ export function formatUnit(value: number | string): string {
355345
return result + 'px';
356346
}
357347

358-
/**
359-
* Function to check whether the platform is blazor or not.
360-
* @return {boolean} result
361-
* @private
362-
*/
363-
export function enableBlazorMode(): void {
364-
isBlazorPlatform = true;
365-
}
366-
367348
/**
368349
* Function to check whether the platform is blazor or not.
369350
* @return {boolean} result
370351
* @private
371352
*/
372353
export function isBlazor(): boolean {
373-
return isBlazorPlatform;
354+
return window && Object.keys(window).indexOf('Blazor') >= 0;
374355
}
375356

376357
/**

controls/base/styles/definition/_bootstrap4.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ $danger: $red !default;
3232
$light: $gray-100 !default;
3333
$dark: $gray-800 !default;
3434
$primary-font: $white !default;
35+
$secondary-font: $white !default;
3536
$content-bg: $white !default;
3637
$content-popup-bg: $white !default;
3738
$skin-name: 'bootstrap4' !default;

controls/calendars/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+
## 17.3.19 (2019-10-22)
6+
7+
### TimePicker
8+
9+
#### Bug Fixes
10+
11+
- `#248416` - In mobile device, TimePicker popup displays in the center of the viewport.
12+
513
## 17.2.49 (2019-09-04)
614

715
### DatePicker

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)