Merge remote-tracking branch 'origin/Development' into Development

This commit is contained in:
George Kalampokis 2022-05-04 10:25:31 +03:00
commit b891907724
1 changed files with 18 additions and 3 deletions

View File

@ -8,7 +8,8 @@ import {FormControl} from "@angular/forms";
<div class="editor-wrapper" [class]="wrapperClasses" [formGroup]="parentFormGroup"> <div class="editor-wrapper" [class]="wrapperClasses" [formGroup]="parentFormGroup">
<angular-editor class="full-width editor" [ngClass]="editable ? '': 'disabled'" [id]="id" <angular-editor class="full-width editor" [ngClass]="editable ? '': 'disabled'" [id]="id"
[config]="editorConfig" [formControlName]="controlName" [config]="editorConfig" [formControlName]="controlName"
placeholder="{{(placeholder? (placeholder | translate) : '') + (required ? ' *': '')}}"></angular-editor> placeholder="{{(placeholder? (placeholder | translate) : '') + (required ? ' *': '')}}"
(paste)="pasteWithoutFormatting($event)"></angular-editor>
<mat-icon *ngIf="formInput.value" (click)="formInput.patchValue('')" class="clear">close</mat-icon> <mat-icon *ngIf="formInput.value" (click)="formInput.patchValue('')" class="clear">close</mat-icon>
</div> </div>
`, `,
@ -40,6 +41,14 @@ export class RichTextEditorComponent {
defaultFontSize: '', defaultFontSize: '',
sanitize: true, sanitize: true,
toolbarPosition: 'top', toolbarPosition: 'top',
customClasses: [
{ name: 'H1 header', class: '', tag: 'h1' },
{ name: 'H2 header', class: '', tag: 'h2' },
{ name: 'H3 header', class: '', tag: 'h3' },
{ name: 'H4 header', class: '', tag: 'h4' },
{ name: 'H5 header', class: '', tag: 'h5'},
{ name: 'H6 header', class: '', tag: 'h6'}
],
toolbarHiddenButtons: [ toolbarHiddenButtons: [
[ [
'heading', 'heading',
@ -48,10 +57,10 @@ export class RichTextEditorComponent {
[ [
'fontSize', 'fontSize',
'backgroundColor', 'backgroundColor',
'customClasses', // 'customClasses',
'insertImage', 'insertImage',
'insertVideo', 'insertVideo',
'removeFormat', // 'removeFormat',
'toggleEditorMode' 'toggleEditorMode'
] ]
] ]
@ -64,4 +73,10 @@ export class RichTextEditorComponent {
ngAfterContentInit() { ngAfterContentInit() {
this.editorConfig.editable = this.editable; this.editorConfig.editable = this.editable;
} }
pasteWithoutFormatting($event) {
$event.preventDefault();
const text = $event.clipboardData.getData("text/plain");
window.document.execCommand("insertText", false, text);
}
} }