Skip to content

Commit 4c84319

Browse files
author
MDBootstrap
authored
Merge pull request #55 from mdbootstrap/dev
5.2.0 Updated to Bootstrap 4 stable version Integration with .NET CORE - tutorial here Compatibility with Angular 5.2.1 and CLI 1.6.5 noImplicitAny and strictNullChecks compatibility New validation added (number, tel, submit) + custom validation regex. Read tutorial. Configurable labels for DatePicker
2 parents 58a3772 + 17c94b7 commit 4c84319

File tree

106 files changed

+1302
-1007
lines changed

Some content is hidden

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

106 files changed

+1302
-1007
lines changed

.directory

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[Dolphin]
2+
Timestamp=2018,2,13,12,19,32
3+
Version=4
4+
5+
[Settings]
6+
HiddenFilesShown=true

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ __________
1616
**Main demo**: https://mdbootstrap.com/angular/components/
1717

1818
# Version:
19-
- Angular CLI 1.5.0 - 1.6.2
20-
- Angular 5.0.0 - 5.1.2
19+
- Angular CLI 1.5.0 - 1.6.5
20+
- Angular 5.0.0 - 5.2.1
2121

2222
# Quick start
2323
- Clone following repo:

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ng-mdb",
3-
"version": "5.1.2",
3+
"version": "5.2.0",
44
"description": "Bootstrap Material Design for Angular",
55
"license": "MIT",
66
"scripts": {

src/.directory

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[Dolphin]
2-
PreviewsShown=true
3-
Timestamp=2018,1,16,13,38,48
2+
Timestamp=2018,2,13,12,7,51
43
Version=4
54

65
[Settings]

src/carousel/carousel.component.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,24 @@ export class CarouselComponent implements OnDestroy {
2525
protected currentInterval: any;
2626
protected isPlaying: boolean;
2727
protected destroyed = false;
28-
protected el: ElementRef = null;
28+
// protected el: ElementRef = null;
29+
protected el: ElementRef | any = null;
2930
protected animationEnd = true;
3031

3132
/** If `true` — carousel will not cycle continuously and will have hard stops (prevent looping) */
3233
@Input() public noWrap: boolean;
3334
/** If `true` — will disable pausing on carousel mouse hover */
3435
@Input() public noPause: boolean;
3536

36-
@Input('isControls') public isControls: boolean;
37+
@Input('isControls') public isControls: boolean = true;
3738
@Input() public keyboard: boolean;
3839

3940
@Input('class') public class: String = '';
4041
@Input('type') public type: String = '';
4142
@Input('animation') public animation: String = '';
4243

43-
44-
protected _currentActiveSlide: number;
44+
// protected _currentActiveSlide: number;
45+
protected _currentActiveSlide: number | any ;
4546

4647
/** Will be emitted when active slide has been changed. Part of two-way-bindable [(activeSlide)] property */
4748
@Output() public activeSlideChange: EventEmitter <any> = new EventEmitter<any>(false);
@@ -128,7 +129,8 @@ export class CarouselComponent implements OnDestroy {
128129
if (this._currentActiveSlide === remIndex) {
129130

130131
// removing of active slide
131-
let nextSlideIndex: number = void 0;
132+
// let nextSlideIndex: number = void 0;
133+
let nextSlideIndex: number | any = void 0;
132134
if (this._slides.length > 1) {
133135
// if this slide last - will roll to first slide, if noWrap flag is FALSE or to previous, if noWrap is TRUE
134136
// in case, if this slide in middle of collection, index of next slide is same to removed

src/carousel/slide.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ export class SlideComponent implements OnInit, OnDestroy {
2424

2525
/** Link to Parent(container-collection) component */
2626
protected carousel: CarouselComponent;
27-
public el: ElementRef = null;
27+
// public el: ElementRef = null;
28+
public el: ElementRef | any = null;
2829

2930
public constructor(carousel: CarouselComponent, el: ElementRef) {
3031
this.carousel = carousel;

src/dropdown/dropdown-toggle.directive.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ export class BsDropdownToggleDirective implements OnDestroy {
1111
private _subscriptions: Subscription[] = [];
1212

1313
@HostBinding('attr.aria-haspopup') ariaHaspopup = true;
14-
@HostBinding('attr.disabled') isDisabled: boolean = null;
14+
// @HostBinding('attr.disabled') isDisabled: boolean = null;
15+
@HostBinding('attr.disabled') isDisabled: boolean | any = null;
1516

1617
// @HostBinding('class.active')
1718
@HostBinding('attr.aria-expanded') isOpen: boolean;
@@ -47,7 +48,8 @@ constructor(private _state: BsDropdownState,
4748
// populate disabled state
4849
this._subscriptions.push(this._state
4950
.isDisabledChange
50-
.subscribe((value: boolean) => this.isDisabled = value || null));
51+
// .subscribe((value: boolean) => this.isDisabled = value || null));
52+
.subscribe((value: boolean | any) => this.isDisabled = value || null));
5153
}
5254

5355
ngOnDestroy(): void {

src/inputs/active.class.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ import {Directive, ElementRef, Input, HostListener, Renderer, AfterViewInit} fr
77
export class ActiveDirective implements AfterViewInit {
88

99
@Input() public mdbActive: ActiveDirective;
10-
public el: ElementRef = null;
11-
public elLabel: ElementRef = null;
12-
public elIcon: Element = null;
10+
// public el: ElementRef = null;
11+
public el: ElementRef | any = null;
12+
// public elLabel: ElementRef = null;
13+
public elLabel: ElementRef | any = null;
14+
// public elIcon: Element = null;
15+
public elIcon: Element | any = null;
1316

1417
constructor(el: ElementRef, public renderer: Renderer) {
1518
this.el = el;

src/inputs/equal-validator.directive.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ export class EqualValidatorDirective implements Validator {
2222
}
2323

2424
validate(c: AbstractControl): { [key: string]: any } {
25+
const setToNullValue: any = null;
2526
// self value (e.g. retype password)
2627
const v = c.value;
2728

2829
// control value (e.g. password)
29-
const e = c.root.get(this.validateEqual);
30+
// const e: any = c.root.get(this.validateEqual);
31+
const e: any = c.root.get(this.validateEqual);
3032

3133
// value not equal
3234
if (e && v !== e.value) {
@@ -48,7 +50,8 @@ export class EqualValidatorDirective implements Validator {
4850
});
4951
}
5052

51-
return null;
53+
// return null;
54+
return setToNullValue;
5255
}
5356
}
5457

0 commit comments

Comments
 (0)