Skip to content

Commit 09f6f00

Browse files
author
pipeline
committed
v21.2.9 is released
1 parent 14be011 commit 09f6f00

File tree

2,557 files changed

+23897
-5316
lines changed

Some content is hidden

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

2,557 files changed

+23897
-5316
lines changed

controls/base/CHANGELOG.md

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

33
## [Unreleased]
44

5+
## 21.2.9 (2023-06-06)
6+
7+
### Common
8+
9+
#### Bug Fixes
10+
11+
- `#I461547` - The issue with the "popup showing on the entire page in the Chrome browser on iPad devices" has been resolved.
12+
13+
## 21.1.35 (2023-05-9)
14+
15+
### Common
16+
17+
#### Bug Fixes
18+
19+
- `#I451675` - The issue in the `template engine` when using `boolean` value has been resolved.
20+
521
## 21.2.3 (2023-05-03)
622

723
### Common

controls/base/spec/template.spec.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ let arrayOfObj = [
3131
}
3232
];
3333
let specialCharValue = [{'@ShipCountry': 'France'}];
34+
let dsJSONArrayBoolean: any=[{name: true,info:{ id:'01'} }, { name: false, info: { id:'02'} }]
3435
let dsJSONArray: any = [{ name: 'one', info: { id: '01' } }, { name: 'two', info: { id: '02' } }];
3536
let dsSubArray: any = [{ name: 'one', items: ['AR Item1', 'AR Item2'] }, { name: 'two', items: ['AR Item1', 'AR Item2'] }];
3637
let dsJSONSubArray: any = [{ name: 'one', info: { id: '01', items: ['AR Item1', 'AR Item2'] } }, { name: 'two', info: { id: '02', items: ['AR Item1', 'AR Item2'] } }];
@@ -255,6 +256,14 @@ describe('Template', () => {
255256
expect(outDOM(template.compile(templateStr), dsJSONArray)).toEqual(result);
256257
});
257258

259+
it('JSON Array Input With IF ELSE Condition Boolean', () => {
260+
let templateStr: string = '<div>${if(name===true)}${info.id}${else}${name}${/if}</div>';
261+
let result: Element[] = [];
262+
result.push(createElement('div', { innerHTML: '01' }));
263+
result.push(createElement('div', { innerHTML: 'false' }));
264+
expect(outDOM(template.compile(templateStr), dsJSONArrayBoolean)).toEqual(result);
265+
});
266+
258267
it('JSON Array Input With Multiple IF Condition', () => {
259268
let templateStr: string = '<div>${if(name=="one" && info.id != "01")}${info.id}${/if}</div>';
260269
let result: Element[] = [];

controls/base/src/browser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ export class Browser {
159159

160160
private static getValue(key: string, regX: RegExp): Object {
161161
const browserDetails: {} = typeof window !== 'undefined' ? window.browserDetails : {};
162-
if (typeof navigator !== 'undefined' && navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1 && Browser.isTouch === true) {
162+
if (typeof navigator !== 'undefined' && navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1 && Browser.isTouch === true && !REGX_BROWSER.CHROME.test(navigator.userAgent)) {
163163
browserDetails['isIos'] = true;
164164
browserDetails['isDevice'] = true;
165165
browserDetails['isTouch'] = true;

controls/base/src/template.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ function evalExp(str: string, nameSpace: string, helper?: Object, ignorePrefix?:
236236
* @returns {string} ?
237237
*/
238238
function addNameSpace(str: string, addNS: boolean, nameSpace: string, ignoreList: string[], ignorePrefix: boolean): string {
239-
return ((addNS && !(NOT_NUMBER.test(str)) && ignoreList.indexOf(str.split('.')[0]) === -1 && !ignorePrefix) ? nameSpace + '.' + str : str);
239+
return ((addNS && !(NOT_NUMBER.test(str)) && ignoreList.indexOf(str.split('.')[0]) === -1 && !ignorePrefix && str !== "true" && str !== "false") ? nameSpace + '.' + str : str);
240240
}
241241

242242
/**

controls/base/styles/definition/_material.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,3 @@ $appbar-hover-bg-color-alt2: rgba(255, 255, 255, .08) !default;
145145
//shadow
146146
$appbar-bottom-shadow: 0 2px 4px rgba(0, 0, 0, .1), 0 2px 6px rgba(0, 0, 0, .16) !default;
147147
$appbar-top-shadow: 0 -2px 3px rgba(0, 0, 0, .1), 0 -2px 6px rgba(0, 0, 0, .2) !default;
148-
149-
//TreeView
150-
$tree-node-text-color:#cc1351 !default;

controls/base/themestudio/styles/base/definition/_material.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,3 @@ $appbar-hover-bg-color-alt2: rgba(255, 255, 255, .08) !default;
145145
//shadow
146146
$appbar-bottom-shadow: 0 2px 4px rgba(0, 0, 0, .1), 0 2px 6px rgba(0, 0, 0, .16) !default;
147147
$appbar-top-shadow: 0 -2px 3px rgba(0, 0, 0, .1), 0 -2px 6px rgba(0, 0, 0, .2) !default;
148-
149-
//TreeView
150-
$tree-node-text-color:#cc1351 !default;

controls/base/themestudio/styles/documenteditor/document-editor/icons/_bootstrap-dark.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
.e-de-multi-cmt-mark::before {
5959
content: '\e98a';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

controls/base/themestudio/styles/documenteditor/document-editor/icons/_bootstrap.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
.e-de-multi-cmt-mark::before {
5959
content: '\e98a';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

controls/base/themestudio/styles/documenteditor/document-editor/icons/_bootstrap4.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
.e-de-multi-cmt-mark::before {
5959
content: '\e978';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

controls/base/themestudio/styles/documenteditor/document-editor/icons/_bootstrap5.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
color: $icon-color;
5959
content: '\e8bc';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

0 commit comments

Comments
 (0)