diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ef1e098f02..7ae394be32 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -38,7 +38,7 @@ export function getBase() { } export function getMetaReducers(config: GlobalConfig): Array> { - const metaReducers: Array> = config.production ? appMetaReducers : [...appMetaReducers, storeFreeze]; + const metaReducers: Array> = config.production ? appMetaReducers : [...appMetaReducers]; return config.debug ? [...metaReducers, ...debugMetaReducers] : metaReducers; } diff --git a/src/app/object-list/item-list-element/item-list-element.component.html b/src/app/object-list/item-list-element/item-list-element.component.html index cc24ba76b8..ef5cf8aec4 100644 --- a/src/app/object-list/item-list-element/item-list-element.component.html +++ b/src/app/object-list/item-list-element/item-list-element.component.html @@ -10,5 +10,6 @@ ({{object.findMetadata("dc.publisher")}}, {{object.findMetadata("dc.date.issued")}}) -
{{object.findMetadata("dc.description.abstract") | dsTruncate:[200] }}
+
+
diff --git a/src/app/object-list/item-list-element/item-list-element.component.ts b/src/app/object-list/item-list-element/item-list-element.component.ts index cc6c837bb7..b3eff81a47 100644 --- a/src/app/object-list/item-list-element/item-list-element.component.ts +++ b/src/app/object-list/item-list-element/item-list-element.component.ts @@ -11,4 +11,6 @@ import { listElementFor } from '../list-element-decorator'; }) @listElementFor(Item) -export class ItemListElementComponent extends ObjectListElementComponent {} +export class ItemListElementComponent extends ObjectListElementComponent { + private lines = 3; +} diff --git a/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts b/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts index 0d4ccff129..79af7a82c9 100644 --- a/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts +++ b/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts @@ -4,7 +4,6 @@ import { listElementFor } from '../../list-element-decorator'; import { ItemSearchResult } from './item-search-result.model'; import { SearchResultListElementComponent } from '../search-result-list-element.component'; import { Item } from '../../../core/shared/item.model'; -import { Observable } from 'rxjs/Observable'; @Component({ selector: 'ds-item-search-result-list-element', @@ -14,5 +13,5 @@ import { Observable } from 'rxjs/Observable'; @listElementFor(ItemSearchResult) export class ItemSearchResultListElementComponent extends SearchResultListElementComponent { - lines = Observable.of(3); + lines = 3; } diff --git a/src/app/shared/truncatable/truncatable.component.html b/src/app/shared/truncatable/truncatable.component.html index 7b5c540a50..aa070c834b 100644 --- a/src/app/shared/truncatable/truncatable.component.html +++ b/src/app/shared/truncatable/truncatable.component.html @@ -1,2 +1 @@ - -{{print(styles)}} \ No newline at end of file + \ No newline at end of file diff --git a/src/app/shared/truncatable/truncatable.component.ts b/src/app/shared/truncatable/truncatable.component.ts index ab4ca21b71..ddece47fd9 100644 --- a/src/app/shared/truncatable/truncatable.component.ts +++ b/src/app/shared/truncatable/truncatable.component.ts @@ -1,10 +1,7 @@ - import { - AfterViewChecked, - AfterViewInit, Component, ElementRef, Inject, Input, + ChangeDetectorRef, Component, ElementRef, Inject, Input, OnInit } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; import { NativeWindowRef, NativeWindowService } from '../window.service'; @Component({ @@ -13,20 +10,19 @@ import { NativeWindowRef, NativeWindowService } from '../window.service'; }) export class TruncatableComponent implements OnInit { - @Input() lines: Observable; + @Input() lines: number; @Input() innerHTML; - @Input() height: Observable; + height; styles: any; - public constructor(private elementRef:ElementRef, @Inject(NativeWindowService) private _window: NativeWindowRef) { } + + public constructor(private elementRef: ElementRef, @Inject(NativeWindowService) private _window: NativeWindowRef, private changeDetectorRef: ChangeDetectorRef) { + } ngOnInit(): void { - const lineHeight = this._window.nativeWindow.getComputedStyle(this.elementRef.nativeElement).lineHeight.replace('px', ''); - this.styles = this._window.nativeWindow.getComputedStyle(this.elementRef.nativeElement); - this.height = this.lines.map((lines) => (lines * lineHeight)).startWith(0); - this.print(this.styles); - } - - print(styles) { - console.log(styles); + this.styles = this._window.nativeWindow.getComputedStyle(this.elementRef.nativeElement); + setTimeout(() => { + this.height = this.styles.lineHeight.replace('px', '') * this.lines; + this.changeDetectorRef.detectChanges(); + }, 0); } } diff --git a/src/app/shared/utils/shave.directive.ts b/src/app/shared/utils/shave.directive.ts index 7a8403aef0..0622b8bb0c 100644 --- a/src/app/shared/utils/shave.directive.ts +++ b/src/app/shared/utils/shave.directive.ts @@ -1,4 +1,7 @@ -import { Directive, ElementRef, Inject, Input, OnDestroy } from '@angular/core'; +import { + Directive, ElementRef, Inject, Input, OnChanges, OnDestroy, + OnInit +} from '@angular/core'; import { default as shave } from 'shave'; import { NativeWindowRef, NativeWindowService } from '../window.service'; import { Observable } from 'rxjs/Observable'; @@ -6,12 +9,33 @@ import { Observable } from 'rxjs/Observable'; @Directive({ selector: '[dsShave]' }) -export class ShaveDirective implements OnDestroy { +export class ShaveDirective implements OnDestroy, OnChanges { + @Input() shave: IShaveOptions = {}; - @Input() shaveHeight: 100; + + @Input() + set shaveHeight(value) { + if (value > 0) { + console.log(value); + this._shaveHeight = value; + } + }; + + get shaveHeight() { + return this._shaveHeight; + } + + private _shaveHeight = 72; private sub; constructor(private ele: ElementRef, @Inject(NativeWindowService) private _window: NativeWindowRef) { + } + + ngOnChanges(): void { + console.log("onchange"); + if (this.shaveHeight > 0) { + this.runShave(); + } this.subscribeForResizeEvent(); }