Browse Source

Added files that were missing in alst commit.

pull/305/head
Sebastian 8 years ago
parent
commit
7253354144
  1. 4
      src/Squidex/app/features/content/shared/assets-editor.component.html
  2. 4
      src/Squidex/app/features/content/shared/references-editor.component.html
  3. 13
      src/Squidex/app/features/content/shared/references-editor.component.ts
  4. 2
      src/Squidex/app/shared/components/markdown-editor.component.html
  5. 2
      src/Squidex/app/shared/components/rich-editor.component.html

4
src/Squidex/app/features/content/shared/assets-editor.component.html

@ -1,7 +1,7 @@
<div class="assets-container" [class.disabled]="isDisabled"> <div class="assets-container" [class.disabled]="isDisabled">
<div class="row"> <div class="row">
<div class="drop-area-container"> <div class="drop-area-container">
<div class="drop-area" (sqxFileDrop)="addFiles($event)" (click)="selectorModal.show()"> <div class="drop-area" (sqxFileDrop)="addFiles($event)" (click)="assetsDialog.show()">
Drop files here to add them. Drop files here to add them.
</div> </div>
</div> </div>
@ -16,6 +16,6 @@
</div> </div>
</div> </div>
<ng-container *sqxModalView="selectorModal;onRoot:true;closeAuto:false"> <ng-container *sqxModalView="assetsDialog;onRoot:true;closeAuto:false">
<sqx-assets-selector (selected)="onAssetsSelected($event)"></sqx-assets-selector> <sqx-assets-selector (selected)="onAssetsSelected($event)"></sqx-assets-selector>
</ng-container> </ng-container>

4
src/Squidex/app/features/content/shared/references-editor.component.html

@ -1,7 +1,7 @@
<div class="references-container" [class.disabled]="isDisabled"> <div class="references-container" [class.disabled]="isDisabled">
<ng-container *ngIf="schema"> <ng-container *ngIf="schema">
<div class="drop-area-container"> <div class="drop-area-container">
<div class="drop-area" (click)="showModal()"> <div class="drop-area" (click)="selectorDialog.show()">
Click here to link a content. Click here to link a content.
</div> </div>
</div> </div>
@ -26,7 +26,7 @@
</div> </div>
</div> </div>
<ng-container *sqxModalView="isModalVisibible;onRoot:true;closeAuto:false"> <ng-container *sqxModalView="selectorDialog;onRoot:true;closeAuto:false">
<sqx-contents-selector <sqx-contents-selector
[language]="language" [language]="language"
[languages]="languages" [languages]="languages"

13
src/Squidex/app/features/content/shared/references-editor.component.ts

@ -15,6 +15,7 @@ import {
AppsState, AppsState,
ContentDto, ContentDto,
ContentsService, ContentsService,
DialogModel,
ImmutableArray, ImmutableArray,
MathHelper, MathHelper,
SchemaDetailsDto, SchemaDetailsDto,
@ -47,7 +48,7 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit {
@Input() @Input()
public languages: ImmutableArray<AppLanguageDto>; public languages: ImmutableArray<AppLanguageDto>;
public isModalVisibible = false; public selectorDialog = new DialogModel();
public schema: SchemaDetailsDto; public schema: SchemaDetailsDto;
@ -110,14 +111,6 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit {
this.callTouched = fn; this.callTouched = fn;
} }
public showModal() {
this.isModalVisibible = true;
}
public hideModal() {
this.isModalVisibible = false;
}
public select(contents: ContentDto[]) { public select(contents: ContentDto[]) {
for (let content of contents) { for (let content of contents) {
this.contentItems = this.contentItems.push(content); this.contentItems = this.contentItems.push(content);
@ -127,7 +120,7 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit {
this.updateValue(); this.updateValue();
} }
this.hideModal(); this.selectorDialog.hide();
} }
public remove(content: ContentDto) { public remove(content: ContentDto) {

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

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

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

@ -6,6 +6,6 @@
</div> </div>
</div> </div>
<ng-container *sqxModalView="selectorModal;onRoot:true;closeAuto:false"> <ng-container *sqxModalView="assetsDialog;onRoot:true;closeAuto:false">
<sqx-assets-selector (selected)="onAssetsSelected($event)"></sqx-assets-selector> <sqx-assets-selector (selected)="onAssetsSelected($event)"></sqx-assets-selector>
</ng-container> </ng-container>
Loading…
Cancel
Save