Browse Source

Cleanup, removed some stupid code.

pull/65/head
Sebastian Stehle 9 years ago
parent
commit
921e2f418f
  1. 4
      src/Squidex/app/features/content/pages/content/content-page.component.html
  2. 24
      src/Squidex/app/features/content/pages/content/content-page.component.ts
  3. 8
      src/Squidex/app/features/content/pages/contents/contents-page.component.ts
  4. 14
      src/Squidex/app/features/content/pages/messages.ts

4
src/Squidex/app/features/content/pages/content/content-page.component.html

@ -5,7 +5,7 @@
<div class="panel-header">
<div class="panel-title-row">
<div class="float-right">
<span *ngIf="isNewMode">
<span *ngIf="!isPublished">
<button type="button" class="btn btn-default" (click)="saveAsDraft()">
Save as Draft
</button>
@ -14,7 +14,7 @@
Save and Publish
</button>
</span>
<span *ngIf="!isNewMode">
<span *ngIf="isPublished">
<button type="submit" class="btn btn-primary">
Save
</button>

24
src/Squidex/app/features/content/pages/content/content-page.component.ts

@ -14,9 +14,7 @@ import { Subscription } from 'rxjs';
import {
ContentCreated,
ContentDeleted,
ContentPublished,
ContentUpdated,
ContentUnpublished
ContentUpdated
} from './../messages';
import {
@ -42,8 +40,6 @@ import {
})
export class ContentPageComponent extends AppComponentBase implements OnDestroy, OnInit {
private contentDeletedSubscription: Subscription;
private contentPublishedSubscription: Subscription;
private contentUnpublishedSubscription: Subscription;
private version: Version = new Version('');
public schema: SchemaDetailsDto;
@ -70,8 +66,6 @@ export class ContentPageComponent extends AppComponentBase implements OnDestroy,
public ngOnDestroy() {
this.contentDeletedSubscription.unsubscribe();
this.contentPublishedSubscription.unsubscribe();
this.contentUnpublishedSubscription.unsubscribe();
}
public ngOnInit() {
@ -83,22 +77,6 @@ export class ContentPageComponent extends AppComponentBase implements OnDestroy,
}
});
this.contentPublishedSubscription =
this.messageBus.of(ContentPublished)
.subscribe(message => {
if (message.id === this.contentId) {
this.isPublished = true;
}
});
this.contentUnpublishedSubscription =
this.messageBus.of(ContentUnpublished)
.subscribe(message => {
if (message.id === this.contentId) {
this.isPublished = false;
}
});
this.route.parent.data.map(p => p['appLanguages'])
.subscribe((languages: AppLanguageDto[]) => {
this.languages = languages;

8
src/Squidex/app/features/content/pages/contents/contents-page.component.ts

@ -13,9 +13,7 @@ import { Subscription } from 'rxjs';
import {
ContentCreated,
ContentDeleted,
ContentPublished,
ContentUpdated,
ContentUnpublished
ContentUpdated
} from './../messages';
import {
@ -122,8 +120,6 @@ export class ContentsPageComponent extends AppComponentBase implements OnDestroy
.switchMap(app => this.contentsService.publishContent(app, this.schema.name, content.id, content.version))
.subscribe(() => {
this.updateContents(content.id, true, content.data, content.version.value);
this.messageBus.publish(new ContentPublished(content.id));
}, error => {
this.notifyError(error);
});
@ -134,8 +130,6 @@ export class ContentsPageComponent extends AppComponentBase implements OnDestroy
.switchMap(app => this.contentsService.unpublishContent(app, this.schema.name, content.id, content.version))
.subscribe(() => {
this.updateContents(content.id, false, content.data, content.version.value);
this.messageBus.publish(new ContentUnpublished(content.id));
}, error => {
this.notifyError(error);
});

14
src/Squidex/app/features/content/pages/messages.ts

@ -24,20 +24,6 @@ export class ContentUpdated {
}
}
export class ContentPublished {
constructor(
public readonly id: string
) {
}
}
export class ContentUnpublished {
constructor(
public readonly id: string
) {
}
}
export class ContentDeleted {
constructor(
public readonly id: string

Loading…
Cancel
Save