Skip to content

Commit 40be986

Browse files
authored
Merge branch '9.1.x' into simeonoff/fix-7455-9.1.x
2 parents a1d6d9c + 80bc542 commit 40be986

36 files changed

+342
-83
lines changed

LICENSE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ https://Infragistics.com/Angular and open a support ticket with a request for fr
88
To acquire a license for commercial usage, please register for trial at https://Infragistics.com/Angular
99
and refer to the purchasing options in the pricing section on the product page.
1010

11+
This repository includes code originally copied from https://github.com/zloirock/core-js
12+
in the projects/igniteui-angular/src/lib/core/setImmediate.ts file. The original version of the code is MIT licensed. See the file header for details.
13+
1114
© Copyright 2020 INFRAGISTICS. All Rights Reserved.
1215
The Infragistics Ultimate license & copyright applies to this distribution.
1316
For information on that license, please go to our website https://www.infragistics.com/legal/license.

package-lock.json

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
"@types/source-map": "0.5.2",
5757
"classlist.js": "^1.1.20150312",
5858
"core-js": "^2.6.11",
59-
"core-js-pure": "^3.6.5",
6059
"hammerjs": "^2.0.8",
6160
"igniteui-trial-watermark": "^1.0.3",
6261
"jszip": "^3.5.0",

projects/igniteui-angular/ng-package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
},
88
"whitelistedNonPeerDependencies": [
99
"@types/hammerjs",
10-
"core-js-pure",
1110
"hammerjs",
1211
"jszip",
1312
"resize-observer-polyfill",

projects/igniteui-angular/ng-package.prod.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
},
1010
"whitelistedNonPeerDependencies": [
1111
"@types/hammerjs",
12-
"core-js-pure",
1312
"hammerjs",
1413
"jszip",
1514
"resize-observer-polyfill",

projects/igniteui-angular/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
],
6868
"dependencies": {
6969
"@types/hammerjs": "^2.0.36",
70-
"core-js-pure": "^3.6.5",
7170
"hammerjs": "^2.0.8",
7271
"jszip": "^3.5.0",
7372
"resize-observer-polyfill": "^1.5.1",

projects/igniteui-angular/schematics/utils/dependency-handler.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export const DEPENDENCIES_MAP: PackageEntry[] = [
2828
{ name: 'resize-observer-polyfill', target: PackageTarget.REGULAR },
2929
{ name: '@types/hammerjs', target: PackageTarget.DEV },
3030
{ name: 'igniteui-trial-watermark', target: PackageTarget.NONE },
31-
{ name: 'core-js-pure', target: PackageTarget.NONE },
3231
// peerDependencies
3332
{ name: '@angular/forms', target: PackageTarget.NONE },
3433
{ name: '@angular/common', target: PackageTarget.NONE },
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/* Copyright (c) 2014-2020 Denis Pushkarev
2+
*
3+
* Permission is hereby granted, free of charge, to any person obtaining a copy
4+
* of this software and associated documentation files (the "Software"), to deal
5+
* in the Software without restriction, including without limitation the rights
6+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
* copies of the Software, and to permit persons to whom the Software is
8+
* furnished to do so, subject to the following conditions:
9+
*
10+
* The above copyright notice and this permission notice shall be included in
11+
* all copies or substantial portions of the Software.
12+
*
13+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
* THE SOFTWARE
20+
*/
21+
22+
// Note: Originally copied from core-js-pure package and modified. (https://github.com/zloirock/core-js)
23+
24+
const queue = {};
25+
let counter = 0;
26+
let eventListenerAdded = false;
27+
28+
const run = function (id) {
29+
if (queue.hasOwnProperty(id)) {
30+
const fn = queue[id];
31+
delete queue[id];
32+
fn();
33+
}
34+
};
35+
36+
const listener = function (event) {
37+
run(event.data);
38+
};
39+
40+
export function setImmediate(cb: any) {
41+
if (window.setImmediate) {
42+
return window.setImmediate(cb);
43+
}
44+
45+
if (!eventListenerAdded) {
46+
eventListenerAdded = true;
47+
window.addEventListener('message', listener, false);
48+
}
49+
50+
const args = [];
51+
let i = 1;
52+
53+
while (arguments.length > i) {
54+
args.push(arguments[i++]);
55+
}
56+
57+
queue[++counter] = function () {
58+
(typeof cb === 'function' ? cb : Function(cb)).apply(undefined, args);
59+
};
60+
61+
const windowLocation = window.location;
62+
window.postMessage(counter + '', windowLocation.protocol + '//' + windowLocation.host);
63+
64+
return counter;
65+
}
66+
67+
export function clearImmediate(id: any) {
68+
if (window.clearImmediate) {
69+
return window.clearImmediate(id);
70+
}
71+
72+
delete queue[id];
73+
}

projects/igniteui-angular/src/lib/core/styles/components/column-hiding/_column-hiding-theme.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
display: flex;
8585
flex-flow: column nowrap;
8686
overflow-y: auto;
87+
outline-style: none;
8788
}
8889

8990
%column-hiding-item {

projects/igniteui-angular/src/lib/core/styles/components/dialog/_dialog-theme.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,15 @@
161161
color: --var($theme, 'message-color');
162162
max-width: 40ch;
163163
padding: $dialog-message-padding;
164+
165+
@media all and (-ms-high-contrast: none)
166+
{
167+
max-width: map-get((
168+
material: 62ch,
169+
fluent: 48ch,
170+
bootstrap: 60ch,
171+
), $variant);
172+
}
164173
}
165174

166175
%igx-dialog-actions {

0 commit comments

Comments
 (0)