added expand status

This commit is contained in:
Nicolas Constant 2019-07-03 20:23:23 -04:00
parent 9011b593ee
commit 35f8c30c26
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
3 changed files with 12 additions and 8 deletions

View File

@ -9,7 +9,7 @@ import { ContextMenuComponent, ContextMenuService } from 'ngx-contextmenu';
import { MastodonService } from '../../../../services/mastodon.service';
import { AccountInfo } from '../../../../states/accounts.state';
import { Status, Account } from '../../../../services/models/mastodon.interfaces';
import { ToolsService } from '../../../../services/tools.service';
import { ToolsService, OpenThreadEvent } from '../../../../services/tools.service';
import { NotificationService } from '../../../../services/notification.service';
import { StatusWrapper } from '../../../../models/common.model';
import { NavigationService } from '../../../../services/navigation.service';
@ -38,6 +38,8 @@ export class ActionBarComponent implements OnInit, OnDestroy {
@Output() replyEvent = new EventEmitter();
@Output() cwIsActiveEvent = new EventEmitter<boolean>();
@Output() browseThreadEvent = new EventEmitter<OpenThreadEvent>();
isFavorited: boolean;
isBoosted: boolean;
@ -237,11 +239,6 @@ export class ActionBarComponent implements OnInit, OnDestroy {
}
}
more(): boolean {
console.warn('more'); //TODO
return false;
}
public onContextMenu($event: MouseEvent): void {
this.contextMenuService.show.next({
// Optional - if unspecified, all context menu components will open
@ -254,7 +251,8 @@ export class ActionBarComponent implements OnInit, OnDestroy {
}
expandStatus(): boolean {
const openThread = new OpenThreadEvent(this.displayedStatus, this.statusWrapper.provider);
this.browseThreadEvent.next(openThread);
return false;
}

View File

@ -93,7 +93,9 @@
[attachments]="displayedStatus.media_attachments">
</app-attachements>
<app-action-bar #appActionBar [statusWrapper]="displayedStatusWrapper" (cwIsActiveEvent)="changeCw($event)"
<app-action-bar #appActionBar [statusWrapper]="displayedStatusWrapper"
(browseThreadEvent)="browseThread($event)"
(cwIsActiveEvent)="changeCw($event)"
(replyEvent)="openReply()"></app-action-bar>
</div>
<app-create-status *ngIf="replyingToStatus" [statusReplyingToWrapper]="displayedStatusWrapper"

View File

@ -177,6 +177,10 @@ export class StatusComponent implements OnInit {
return false;
}
browseThread(event: OpenThreadEvent): void {
this.browseThreadEvent.next(event);
}
openUrl(url: string): boolean {
event.preventDefault();
window.open(url, "_blank");