From 466dea310b2b2bfa50f236a44e31ce1e70628d8b Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Tue, 9 Aug 2016 16:15:58 -0400 Subject: [PATCH] feat(loading): add ability to pass multiple classes to cssClass references #7618 --- src/components/loading/loading-component.ts | 15 +++++++++++++-- src/components/loading/test/basic/index.ts | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/components/loading/loading-component.ts b/src/components/loading/loading-component.ts index de0889da13..a15569d631 100644 --- a/src/components/loading/loading-component.ts +++ b/src/components/loading/loading-component.ts @@ -32,7 +32,15 @@ import { ViewController } from '../nav/view-controller'; encapsulation: ViewEncapsulation.None, }) export class LoadingCmp { - private d: any; + private d: { + spinner?: string; + content?: string; + cssClass?: string; + showBackdrop?: boolean; + dismissOnPageChange?: boolean; + delay?: number; + duration?: number; + }; private id: number; private showSpinner: boolean; private durationTimeout: number; @@ -47,7 +55,10 @@ export class LoadingCmp { this.d = params.data; if (this.d.cssClass) { - renderer.setElementClass(_elementRef.nativeElement, this.d.cssClass, true); + this.d.cssClass.split(' ').forEach(cssClass => { + // Make sure the class isn't whitespace, otherwise it throws exceptions + if (cssClass.trim() !== '') renderer.setElementClass(_elementRef.nativeElement, cssClass, true); + }); } this.id = (++loadingIds); diff --git a/src/components/loading/test/basic/index.ts b/src/components/loading/test/basic/index.ts index e5a4dfccf9..aa396d6360 100644 --- a/src/components/loading/test/basic/index.ts +++ b/src/components/loading/test/basic/index.ts @@ -67,7 +67,7 @@ class E2EPage { presentLoadingDefault() { let loading = this.loadingCtrl.create({ content: 'Please wait...', - cssClass: 'fixed-spinner' + cssClass: 'fixed-spinner spinner-class' }); loading.present();