Browse Source

Fix markdown and rich editor.

pull/334/head
Sebastian Stehle 7 years ago
parent
commit
4eafebb1aa
  1. 2
      src/Squidex/app/shared/components/markdown-editor.component.html
  2. 2
      src/Squidex/app/shared/components/markdown-editor.component.scss
  3. 7
      src/Squidex/app/shared/components/markdown-editor.component.ts
  4. 2
      src/Squidex/app/shared/components/rich-editor.component.html
  5. 5
      src/Squidex/app/shared/components/rich-editor.component.ts

2
src/Squidex/app/shared/components/markdown-editor.component.html

@ -9,5 +9,5 @@
</div>
<ng-container *sqxModalView="assetsDialog;onRoot:true;closeAuto:false">
<sqx-assets-selector (selected)="onAssetsSelected($event)"></sqx-assets-selector>
<sqx-assets-selector (selected)="insertAssets($event)"></sqx-assets-selector>
</ng-container>

2
src/Squidex/app/shared/components/markdown-editor.component.scss

@ -11,5 +11,5 @@ $background: #fff;
@include fixed(0, 0, 0, 0);
border: 0;
background: $background;
z-index: 100000;
z-index: 1040;
}

7
src/Squidex/app/shared/components/markdown-editor.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
*/
import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, forwardRef, Renderer2, ViewChild } from '@angular/core';
import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, Renderer2, ViewChild } from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import {
@ -49,6 +49,7 @@ export class MarkdownEditorComponent implements ControlValueAccessor, AfterViewI
public isFullscreen = false;
constructor(
private readonly changeDetector: ChangeDetectorRef,
private readonly renderer: Renderer2,
private readonly resourceLoader: ResourceLoaderService
) {
@ -81,6 +82,8 @@ export class MarkdownEditorComponent implements ControlValueAccessor, AfterViewI
private showSelector = () => {
this.assetsDialog.show();
this.changeDetector.detectChanges();
}
public ngAfterViewInit() {
@ -188,6 +191,8 @@ export class MarkdownEditorComponent implements ControlValueAccessor, AfterViewI
}
this.renderer.appendChild(target, this.inner.nativeElement);
this.changeDetector.detectChanges();
});
this.simplemde.codemirror.on('blur', () => {

2
src/Squidex/app/shared/components/rich-editor.component.html

@ -7,5 +7,5 @@
</div>
<ng-container *sqxModalView="assetsDialog;onRoot:true;closeAuto:false">
<sqx-assets-selector (selected)="onAssetsSelected($event)"></sqx-assets-selector>
<sqx-assets-selector (selected)="insertAssets($event)"></sqx-assets-selector>
</ng-container>

5
src/Squidex/app/shared/components/rich-editor.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
*/
import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, EventEmitter, forwardRef, OnDestroy, Output, ViewChild } from '@angular/core';
import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, forwardRef, OnDestroy, Output, ViewChild } from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import {
@ -45,6 +45,7 @@ export class RichEditorComponent implements ControlValueAccessor, AfterViewInit,
public assetPluginClicked = new EventEmitter<any>();
constructor(
private readonly changeDetector: ChangeDetectorRef,
private readonly resourceLoader: ResourceLoaderService
) {
}
@ -65,6 +66,8 @@ export class RichEditorComponent implements ControlValueAccessor, AfterViewInit,
private showSelector = () => {
this.assetsDialog.show();
this.changeDetector.detectChanges();
}
private getEditorOptions() {

Loading…
Cancel
Save