File tree Expand file tree Collapse file tree 6 files changed +17
-7
lines changed Expand file tree Collapse file tree 6 files changed +17
-7
lines changed Original file line number Diff line number Diff line change @@ -94,6 +94,12 @@ ion-alert {
94
94
text-align : $alert-ios-message-text-align ;
95
95
}
96
96
97
+ .alert-message {
98
+ & :empty {
99
+ padding : 0 0 12px 0 ;
100
+ }
101
+ }
102
+
97
103
98
104
// iOS Alert Input
99
105
// --------------------------------------------------
Original file line number Diff line number Diff line change @@ -69,6 +69,10 @@ $alert-md-buttons-justify-content: flex-end !default;
69
69
70
70
.alert-message {
71
71
font-size : $alert-md-message-font-size ;
72
+
73
+ & :empty {
74
+ padding : 0 ;
75
+ }
72
76
}
73
77
74
78
Original file line number Diff line number Diff line change @@ -52,10 +52,6 @@ ion-alert {
52
52
53
53
.alert-message {
54
54
overflow : auto ;
55
-
56
- & :empty {
57
- padding : 0 ;
58
- }
59
55
}
60
56
61
57
.alert-input {
Original file line number Diff line number Diff line change @@ -248,7 +248,7 @@ export class Alert extends ViewController {
248
248
'<h2 id="{{hdrId}}" class="alert-title" *ngIf="d.title" [innerHTML]="d.title"></h2>' +
249
249
'<h3 id="{{subHdrId}}" class="alert-sub-title" *ngIf="d.subTitle" [innerHTML]="d.subTitle"></h3>' +
250
250
'</div>' +
251
- '<div id="{{msgId}}" class="alert-message" *ngIf="d.message" [innerHTML]="d.message"></div>' +
251
+ '<div id="{{msgId}}" class="alert-message" [innerHTML]="d.message"></div>' +
252
252
'<div *ngIf="d.inputs.length" [ngSwitch]="inputType">' +
253
253
254
254
'<template ngSwitchWhen="radio">' +
@@ -335,6 +335,10 @@ class AlertCmp {
335
335
} else if ( this . d . subTitle ) {
336
336
this . descId = this . subHdrId ;
337
337
}
338
+
339
+ if ( ! this . d . message ) {
340
+ this . d . message = '' ;
341
+ }
338
342
}
339
343
340
344
onPageLoaded ( ) {
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ class E2EPage {
59
59
this . nav . present ( alert ) ;
60
60
}
61
61
62
- doAlertNoBody ( ) {
62
+ doAlertNoMessage ( ) {
63
63
let alert = Alert . create ( {
64
64
title : 'Alert' ,
65
65
buttons : [ 'OK' ]
Original file line number Diff line number Diff line change 7
7
< button block class ="e2eOpenAlert " (click) ="doAlert() "> Alert</ button >
8
8
< button block class ="e2eOpenAlertLongMessage " (click) ="doAlertLongMessage() "> Alert Long Message</ button >
9
9
< button block class ="e2eOpenMultipleButtons " (click) ="doMultipleButtons() "> Multiple Buttons (> 2)</ button >
10
- < button block class ="e2eOpenAlertNoBody " (click) ="doAlertNoBody () "> Alert No Body </ button >
10
+ < button block class ="e2eOpenAlertNoMessage " (click) ="doAlertNoMessage () "> Alert No Message </ button >
11
11
< button block class ="e2eOpenConfirm " (click) ="doConfirm() "> Confirm</ button >
12
12
< button block class ="e2eOpenPrompt " (click) ="doPrompt() "> Prompt</ button >
13
13
< button block class ="e2eOpenRadio " (click) ="doRadio() "> Radio</ button >
You can’t perform that action at this time.
0 commit comments