Browse Source

Merge branch 'dev' of https://github.com/abpframework/abp into dev

pull/16128/head
Ebicoglu 4 years ago
parent
commit
5e935bd904
  1. 3
      npm/ng-packs/packages/core/src/lib/core.module.ts
  2. 1
      npm/ng-packs/packages/core/src/lib/pipes/index.ts
  3. 13
      npm/ng-packs/packages/core/src/lib/pipes/safe-html.pipe.ts
  4. 12
      npm/ng-packs/packages/theme-basic/src/lib/components/page-alert-container/page-alert-container.component.html

3
npm/ng-packs/packages/core/src/lib/core.module.ts

@ -33,6 +33,7 @@ import { getInitialData, localeInitializer } from './utils/initial-utils';
import { ShortDateTimePipe } from './pipes/short-date-time.pipe'; import { ShortDateTimePipe } from './pipes/short-date-time.pipe';
import { ShortTimePipe } from './pipes/short-time.pipe'; import { ShortTimePipe } from './pipes/short-time.pipe';
import { ShortDatePipe } from './pipes/short-date.pipe'; import { ShortDatePipe } from './pipes/short-date.pipe';
import { SafeHtmlPipe } from './pipes/safe-html.pipe';
import { QUEUE_MANAGER } from './tokens/queue.token'; import { QUEUE_MANAGER } from './tokens/queue.token';
import { DefaultQueueManager } from './utils/queue'; import { DefaultQueueManager } from './utils/queue';
import { IncludeLocalizationResourcesProvider } from './providers/include-localization-resources.provider'; import { IncludeLocalizationResourcesProvider } from './providers/include-localization-resources.provider';
@ -63,6 +64,7 @@ import { IncludeLocalizationResourcesProvider } from './providers/include-locali
ReplaceableTemplateDirective, ReplaceableTemplateDirective,
RouterOutletComponent, RouterOutletComponent,
SortPipe, SortPipe,
SafeHtmlPipe,
StopPropagationDirective, StopPropagationDirective,
ToInjectorPipe, ToInjectorPipe,
ShortDateTimePipe, ShortDateTimePipe,
@ -90,6 +92,7 @@ import { IncludeLocalizationResourcesProvider } from './providers/include-locali
ReplaceableTemplateDirective, ReplaceableTemplateDirective,
RouterOutletComponent, RouterOutletComponent,
SortPipe, SortPipe,
SafeHtmlPipe,
StopPropagationDirective, StopPropagationDirective,
ToInjectorPipe, ToInjectorPipe,
ShortDateTimePipe, ShortDateTimePipe,

1
npm/ng-packs/packages/core/src/lib/pipes/index.ts

@ -1,4 +1,5 @@
export * from './localization.pipe'; export * from './localization.pipe';
export * from './safe-html.pipe';
export * from './sort.pipe'; export * from './sort.pipe';
export * from './to-injector.pipe'; export * from './to-injector.pipe';
export * from './short-date.pipe'; export * from './short-date.pipe';

13
npm/ng-packs/packages/core/src/lib/pipes/safe-html.pipe.ts

@ -0,0 +1,13 @@
import { inject, Injectable, Pipe, PipeTransform, SecurityContext } from '@angular/core';
import { DomSanitizer } from '@angular/platform-browser';
@Injectable()
@Pipe({ name: 'abpSafeHtml' })
export class SafeHtmlPipe implements PipeTransform {
private readonly sanitizer = inject(DomSanitizer);
transform(value: string): string {
if (typeof value !== 'string') return '';
return this.sanitizer.sanitize(SecurityContext.HTML, value);
}
}

12
npm/ng-packs/packages/theme-basic/src/lib/components/page-alert-container/page-alert-container.component.html

@ -4,10 +4,14 @@
[ngClass]="{ 'alert-dismissible fade show': alert.dismissible }" [ngClass]="{ 'alert-dismissible fade show': alert.dismissible }"
role="alert" role="alert"
> >
<h4 class="alert-heading" *ngIf="alert.title"> <h4
{{ alert.title | abpLocalization: alert.titleLocalizationParams }} class="alert-heading"
</h4> *ngIf="alert.title"
{{ alert.message | abpLocalization: alert.messageLocalizationParams }} [innerHTML]="alert.title | abpSafeHtml | abpLocalization: alert.titleLocalizationParams"
></h4>
<span
[innerHTML]="alert.message | abpSafeHtml | abpLocalization: alert.messageLocalizationParams"
></span>
<button <button
*ngIf="alert.dismissible" *ngIf="alert.dismissible"
type="button" type="button"

Loading…
Cancel
Save