Skip to content

Commit 466dea3

Browse files
committed
feat(loading): add ability to pass multiple classes to cssClass
references #7618
1 parent 68ab261 commit 466dea3

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

src/components/loading/loading-component.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,15 @@ import { ViewController } from '../nav/view-controller';
3232
encapsulation: ViewEncapsulation.None,
3333
})
3434
export class LoadingCmp {
35-
private d: any;
35+
private d: {
36+
spinner?: string;
37+
content?: string;
38+
cssClass?: string;
39+
showBackdrop?: boolean;
40+
dismissOnPageChange?: boolean;
41+
delay?: number;
42+
duration?: number;
43+
};
3644
private id: number;
3745
private showSpinner: boolean;
3846
private durationTimeout: number;
@@ -47,7 +55,10 @@ export class LoadingCmp {
4755
this.d = params.data;
4856

4957
if (this.d.cssClass) {
50-
renderer.setElementClass(_elementRef.nativeElement, this.d.cssClass, true);
58+
this.d.cssClass.split(' ').forEach(cssClass => {
59+
// Make sure the class isn't whitespace, otherwise it throws exceptions
60+
if (cssClass.trim() !== '') renderer.setElementClass(_elementRef.nativeElement, cssClass, true);
61+
});
5162
}
5263

5364
this.id = (++loadingIds);

src/components/loading/test/basic/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class E2EPage {
6767
presentLoadingDefault() {
6868
let loading = this.loadingCtrl.create({
6969
content: 'Please wait...',
70-
cssClass: 'fixed-spinner'
70+
cssClass: 'fixed-spinner spinner-class'
7171
});
7272

7373
loading.present();

0 commit comments

Comments
 (0)