Browse Source

merge from branch 'algoadv-contrib'

pull/159/head
sowobm 8 years ago
parent
commit
e182046368
  1. 1
      src/Squidex/app/framework/declarations.ts
  2. 3
      src/Squidex/app/framework/module.ts
  3. 3
      src/Squidex/app/shared/components/asset.component.ts

1
src/Squidex/app/framework/declarations.ts

@ -36,7 +36,6 @@ export * from './angular/panel-container.directive';
export * from './angular/parent-link.directive'; export * from './angular/parent-link.directive';
export * from './angular/popup-link.directive'; export * from './angular/popup-link.directive';
export * from './angular/progress-bar.component'; export * from './angular/progress-bar.component';
// export * from './angular/rich-editor.component';
export * from './angular/root-view.directive'; export * from './angular/root-view.directive';
export * from './angular/router-utils'; export * from './angular/router-utils';
export * from './angular/scroll-active.directive'; export * from './angular/scroll-active.directive';

3
src/Squidex/app/framework/module.ts

@ -54,7 +54,6 @@ import {
PopupLinkDirective, PopupLinkDirective,
ProgressBarComponent, ProgressBarComponent,
ResourceLoaderService, ResourceLoaderService,
// RichEditorComponent,
RootViewDirective, RootViewDirective,
RootViewService, RootViewService,
ScrollActiveDirective, ScrollActiveDirective,
@ -115,7 +114,6 @@ import {
ParentLinkDirective, ParentLinkDirective,
PopupLinkDirective, PopupLinkDirective,
ProgressBarComponent, ProgressBarComponent,
// RichEditorComponent,
RootViewDirective, RootViewDirective,
ScrollActiveDirective, ScrollActiveDirective,
ShortcutComponent, ShortcutComponent,
@ -164,7 +162,6 @@ import {
ParentLinkDirective, ParentLinkDirective,
PopupLinkDirective, PopupLinkDirective,
ProgressBarComponent, ProgressBarComponent,
// RichEditorComponent,
RootViewDirective, RootViewDirective,
ScrollActiveDirective, ScrollActiveDirective,
ShortcutComponent, ShortcutComponent,

3
src/Squidex/app/shared/components/asset.component.ts

@ -61,6 +61,9 @@ export class AssetComponent extends AppComponentBase implements OnInit {
@Output() @Output()
public deleting = new EventEmitter<AssetDto>(); public deleting = new EventEmitter<AssetDto>();
@Output()
public clicked = new EventEmitter<AssetDto>();
@Output() @Output()
public failed = new EventEmitter(); public failed = new EventEmitter();

Loading…
Cancel
Save