Skip to content

Commit 1c19a93

Browse files
ChronosSFChronosSF
authored
Merge branch 'master' into mkirova/fix-7434
2 parents 5897fde + ae3cebd commit 1c19a93

File tree

19 files changed

+162
-54
lines changed

19 files changed

+162
-54
lines changed

‎LICENSE‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
This project is released under the Apache License, version 2.0.
21
This is a commercial product, requiring a valid paid-for license for commercial use.
3-
This product is free to use for non-commercial applications, like non-profits and educational usage.
2+
This product is free to use for non-commercial educational use for students in K through 12 grades
3+
or University programs, and for educators to use in a classroom setting as examples / tools in their curriculum.
44

5-
To acquire a license for commercial usage,
6-
please register for a trial and acquire a license at https://Infragistics.com/Angular.
5+
In order for us to verify your eligibility for free usage, please register for trial at
6+
https://Infragistics.com/Angular and open a support ticket with a request for free license.
77

8-
© Copyright 2020 INFRAGISTICS. All Rights Reserved.
9-
The Infragistics Ultimate license & copyright applies to this distribution.
8+
To acquire a license for commercial usage, please register for trial at https://Infragistics.com/Angular
9+
and refer to the purchasing options in the pricing section on the product page.
10+
11+
© Copyright 2020 INFRAGISTICS. All Rights Reserved.
12+
The Infragistics Ultimate license & copyright applies to this distribution.
1013
For information on that license, please go to our website https://www.infragistics.com/legal/license.

‎README.md‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,16 @@ Developer support is provided as part of the commercial, paid-for license via [I
202202
Community support for open source usage of this product is available at [StackOverflow](https://stackoverflow.com/questions/tagged/ignite-ui-angular).
203203

204204
## License
205-
This project is released under the Apache License, version 2.0. This is a commercial product, requiring a valid paid-for license for commercial use. This product is free to use for non-commercial applications, like non-profits and educational usage.
205+
This is a commercial product, requiring a valid paid-for license for commercial use.
206+
This product is free to use for non-commercial educational use for students in K through 12 grades or University programs, and for educators to use in a classroom setting as examples / tools in their curriculum.
207+
In order for us to verify your eligibility for free usage, please [register for trial](https://Infragistics.com/Angular) and open a support ticket with a request for free license.
206208

207-
To acquire a license for commercial usage, please register for a trial and acquire a license at [Infragistics.com/Angular](https://www.infragistics.com/products/ignite-ui-angular/getting-started).
209+
To acquire a license for commercial usage, please [register for trial](https://Infragistics.com/Angular) and refer to the purchasing options in the pricing section on the product page.
210+
211+
© Copyright 2020 INFRAGISTICS. All Rights Reserved.
212+
The Infragistics Ultimate license & copyright applies to this distribution.
213+
For information on that license, please go to our website [https://www.infragistics.com/legal/license](https://www.infragistics.com/legal/license).
208214

209-
© Copyright 2017 INFRAGISTICS. All Rights Reserved. The Infragistics Ultimate license & copyright applies to this distribution. For information on that license, please go to our website [here](https://www.infragistics.com/legal/license).
210215

211216

212217

‎projects/igniteui-angular/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"web-animations-js": "^2.3.2"
8282
},
8383
"igxDevDependencies": {
84-
"@igniteui/angular-schematics": "~9.0.500"
84+
"@igniteui/angular-schematics": "~9.1.510-beta.0"
8585
},
8686
"ng-update": {
8787
"migrations": "./migrations/migration-collection.json"

‎projects/igniteui-angular/src/lib/carousel/carousel.component.ts‎

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ export class IgxCarouselComponent implements OnDestroy, AfterContentInit {
437437
private newDuration = 0;
438438

439439
constructor(private element: ElementRef, private iterableDiffers: IterableDiffers,
440-
private builder: AnimationBuilder, private platformUtil: PlatformUtil) {
440+
private builder: AnimationBuilder, private platformUtil: PlatformUtil) {
441441
this.differ = this.iterableDiffers.find([]).create(null);
442442
}
443443

@@ -472,15 +472,18 @@ export class IgxCarouselComponent implements OnDestroy, AfterContentInit {
472472
}
473473

474474
if (this.currentSlide) {
475-
const animationWasStarted = this.finishAnimations();
475+
if (this.previousSlide && this.previousSlide.previous) {
476+
this.previousSlide.previous = false;
477+
}
476478
this.currentSlide.direction = slide.direction;
477479
this.currentSlide.active = false;
478480

479481
this.previousSlide = this.currentSlide;
480482
this.currentSlide = slide;
481483
if (this.animationType !== CarouselAnimationType.none) {
482-
if (animationWasStarted) {
484+
if (this.animationStarted(this.leaveAnimationPlayer) || this.animationStarted(this.enterAnimationPlayer)) {
483485
requestAnimationFrame(() => {
486+
this.resetAnimations();
484487
this.playAnimations();
485488
});
486489
} else {
@@ -500,20 +503,28 @@ export class IgxCarouselComponent implements OnDestroy, AfterContentInit {
500503
this.playEnterAnimation();
501504
}
502505

503-
private finishAnimations(): boolean {
504-
let animationWasStarted = false;
505-
if (this.previousSlide && this.previousSlide.previous) {
506-
this.previousSlide.previous = false;
507-
}
508-
if (this.leaveAnimationPlayer) {
509-
animationWasStarted = true;
506+
private finishAnimations() {
507+
if (this.animationStarted(this.leaveAnimationPlayer)) {
510508
this.leaveAnimationPlayer.finish();
511509
}
512-
if (this.enterAnimationPlayer) {
513-
animationWasStarted = true;
510+
511+
if (this.animationStarted(this.enterAnimationPlayer)) {
514512
this.enterAnimationPlayer.finish();
515513
}
516-
return animationWasStarted;
514+
}
515+
516+
private resetAnimations() {
517+
if (this.animationStarted(this.leaveAnimationPlayer)) {
518+
this.leaveAnimationPlayer.reset();
519+
}
520+
521+
if (this.animationStarted(this.enterAnimationPlayer)) {
522+
this.enterAnimationPlayer.reset();
523+
}
524+
}
525+
526+
private animationStarted(animation: AnimationPlayer): boolean {
527+
return animation && animation.hasStarted();
517528
}
518529

519530
private getAnimation(): CarouselAnimationSettings {
@@ -565,10 +576,11 @@ export class IgxCarouselComponent implements OnDestroy, AfterContentInit {
565576
}
566577

567578
private playEnterAnimation() {
568-
if (!this.getAnimation().enterAnimation) {
579+
const animation = this.getAnimation().enterAnimation;
580+
if (!animation) {
569581
return;
570582
}
571-
const animationBuilder = this.builder.build(this.getAnimation().enterAnimation);
583+
const animationBuilder = this.builder.build(animation);
572584

573585
this.enterAnimationPlayer = animationBuilder.create(this.currentSlide.nativeElement);
574586

@@ -586,11 +598,12 @@ export class IgxCarouselComponent implements OnDestroy, AfterContentInit {
586598
}
587599

588600
private playLeaveAnimation() {
589-
if (!this.getAnimation().leaveAnimation) {
601+
const animation = this.getAnimation().leaveAnimation;
602+
if (!animation) {
590603
return;
591604
}
592605

593-
const animationBuilder = this.builder.build(this.getAnimation().leaveAnimation);
606+
const animationBuilder = this.builder.build(animation);
594607
this.leaveAnimationPlayer = animationBuilder.create(this.previousSlide.nativeElement);
595608

596609
this.leaveAnimationPlayer.onDone(() => {
@@ -1021,6 +1034,10 @@ export class IgxCarouselComponent implements OnDestroy, AfterContentInit {
10211034
this.stoppedByInteraction = true;
10221035
this.stop();
10231036
}
1037+
1038+
if (this.previousSlide && this.previousSlide.previous) {
1039+
this.previousSlide.previous = false;
1040+
}
10241041
this.finishAnimations();
10251042

10261043
if (this.incomingSlide) {

‎projects/igniteui-angular/src/lib/core/styles/components/date-range-picker/_date-range-picker-theme.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
));
3232
}
3333

34+
/// @param {Map} $theme - The theme used to style the component.
35+
/// @requires {mixin} igx-root-css-vars
36+
/// @requires rem
37+
/// @requires --var
3438
@mixin igx-date-range-picker($theme) {
3539
@include igx-root-css-vars($theme);
3640
$left: if-ltr(left, right);

‎projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,6 @@
409409
}
410410

411411
%form-group-display--disabled {
412-
pointer-events: none;
413412
user-select: none;
414413
color: --var($theme, 'disabled-text-color');
415414
}

‎projects/igniteui-angular/src/lib/core/styles/components/radio/_radio-theme.scss‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
@import '../ripple/ripple-theme';
22
@import '../ripple/ripple-component';
3-
///
3+
4+
////
45
/// @group themes
56
/// @access public
67
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
78
/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
8-
///
9+
////
10+
911
/// @param {Map} $palette [$default-palette] - The palette used as basis for styling the component.
1012
/// @param {Map} $schema [$light-schema] - The schema used as basis for styling the component.
1113
///

‎projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_action-strip.scss‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
@import '../light/action-strip';
2+
23
////
34
/// @group schemas
45
/// @access private
56
/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
67
////
7-
///
8+
89
/// Generates a dark action-strip schema.
910
/// @type {Map}
1011
/// @property {Map} actions-background [igx-color: ('grays', 200), hexrgba: #000, rgba: .8]- actions container background.
@@ -25,22 +26,12 @@ $_dark-action-strip: extend(
2526
/// Generates a dark fluent action strip schema.
2627
/// @type {Map}
2728
/// @requires {function} extend
28-
/// @requires $_dark-action-strip
29-
$_dark-fluent-action-strip: extend(
30-
$_dark-action-strip,
31-
(
32-
variant: 'fluent',
33-
)
34-
);
29+
/// @requires $_fluent-action-strip
30+
$_dark-fluent-action-strip: extend($_fluent-action-strip);
3531

3632
/// Generates a dark bootstrap action strip schema.
3733
/// @type {Map}
3834
/// @requires {function} extend
39-
/// @requires $_dark-action-strip
40-
$_dark-bootstrap-action-strip: extend(
41-
$_dark-action-strip,
42-
(
43-
variant: 'bootstrap',
44-
)
45-
);
35+
/// @requires $_bootstrap-action-strip
36+
$_dark-bootstrap-action-strip: extend($_bootstrap-action-strip);
4637

‎projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_watermark.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@import '../light/watermark';
2+
23
////
34
/// @group schemas
45
/// @access private

‎projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_action-strip.scss‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
@import '../shape/action-strip';
2+
23
////
34
/// @group schemas
45
/// @access private
56
/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
67
////
7-
///
8+
89
/// Generates a light action-strip schema.
910
/// @type {Map}
1011
/// @prop {Color} $color ["'currentColor'"] - The color used for the actions icons.
@@ -38,7 +39,7 @@ $_light-action-strip: extend(
3839

3940
/// Generates a fluent action strip schema.
4041
/// @type {Map}
41-
/// @prop {Number} border-radius [0] - The border radius fraction, between 0-1 to be used for action strip actions container..
42+
/// @prop {Number} border-radius [0] - The border radius fraction, between 0-1 to be used for action strip actions container.
4243
/// @requires {function} extend
4344
/// @requires $_light-action-strip
4445
$_fluent-action-strip: extend(

0 commit comments

Comments
 (0)