javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(alert): allow innerHTML in message

Browse Source 
Closes #918
This commit is contained in:
Adam Bradley
2016-01-10 12:25:40 -06:00
parent c05d19606a
commit c2e753f780
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ionic/components/alert/alert.ts
View File

@@ -196,10 +196,10 @@ export class Alert extends ViewController {
'<div (click)="dismiss()" tappable disable-activated class="backdrop" role="presentation"></div>' +
'<div class="alert-wrapper">' +
'<div class="alert-head">' +
'<h2 id="{{hdrId}}" class="alert-title" *ngIf="d.title">{{d.title}}</h2>' +
'<h3 id="{{subHdrId}}" class="alert-sub-title" *ngIf="d.subTitle">{{d.subTitle}}</h3>' +
'<h2 id="{{hdrId}}" class="alert-title" *ngIf="d.title" [innerHTML]="d.title"></h2>' +
'<h3 id="{{subHdrId}}" class="alert-sub-title" *ngIf="d.subTitle" [innerHTML]="d.subTitle"></h3>' +
'</div>' +
'<div id="{{msgId}}" class="alert-message" *ngIf="d.message">{{d.message}}</div>' +
'<div id="{{msgId}}" class="alert-message" *ngIf="d.message" [innerHTML]="d.message"></div>' +
'<div *ngIf="d.inputs.length" [ngSwitch]="inputType">' +
'<template ngSwitchWhen="radio">' +

4
ionic/components/alert/test/basic/index.ts
View File

@@ -27,7 +27,7 @@ class E2EPage {
doConfirm() {
let alert = Alert.create();
alert.setTitle('Confirm!');
alert.setMessage('Message text!!!');
alert.setMessage('Message <strong>text</strong>!!!');
alert.addButton({
text: 'Cancel',
handler: () => {
@@ -37,7 +37,7 @@ class E2EPage {
}
});
alert.addButton({
text: 'Ok',
text: 'Okay',
handler: () => {
console.log('Confirm Ok');
this.testConfirmResult = 'Ok';