diff --git a/src/app/components/stream/status/databinded-text/databinded-text.component.html b/src/app/components/stream/status/databinded-text/databinded-text.component.html index 96aa742f..00923173 100644 --- a/src/app/components/stream/status/databinded-text/databinded-text.component.html +++ b/src/app/components/stream/status/databinded-text/databinded-text.component.html @@ -1 +1 @@ -
\ No newline at end of file +
\ No newline at end of file diff --git a/src/app/components/stream/status/databinded-text/databinded-text.component.scss b/src/app/components/stream/status/databinded-text/databinded-text.component.scss index 0df7c1c2..2c17e4cf 100644 --- a/src/app/components/stream/status/databinded-text/databinded-text.component.scss +++ b/src/app/components/stream/status/databinded-text/databinded-text.component.scss @@ -1,6 +1,6 @@ @import "variables"; -.content { +.selectable { cursor: pointer; } diff --git a/src/app/components/stream/status/databinded-text/databinded-text.component.ts b/src/app/components/stream/status/databinded-text/databinded-text.component.ts index 56e475e4..73d7ce8d 100644 --- a/src/app/components/stream/status/databinded-text/databinded-text.component.ts +++ b/src/app/components/stream/status/databinded-text/databinded-text.component.ts @@ -18,6 +18,8 @@ export class DatabindedTextComponent implements OnInit { @Output() hashtagSelected = new EventEmitter(); @Output() textSelected = new EventEmitter(); + @Input() textIsSelectable: boolean = true; + @Input('text') set text(value: string) { this.processedText = ''; diff --git a/src/app/components/stream/stream-overlay/stream-overlay.component.html b/src/app/components/stream/stream-overlay/stream-overlay.component.html index 212131fb..5c108a57 100644 --- a/src/app/components/stream/stream-overlay/stream-overlay.component.html +++ b/src/app/components/stream/stream-overlay/stream-overlay.component.html @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/src/app/components/stream/stream-overlay/stream-overlay.component.ts b/src/app/components/stream/stream-overlay/stream-overlay.component.ts index 8705f67a..099b14b8 100644 --- a/src/app/components/stream/stream-overlay/stream-overlay.component.ts +++ b/src/app/components/stream/stream-overlay/stream-overlay.component.ts @@ -25,7 +25,7 @@ export class StreamOverlayComponent implements OnInit { @Input('browseAccount') set browseAccount(accountName: string) { - this.accountName = accountName; + this.loadAccount(accountName); // let selectedAccounts = this.toolsService.getSelectedAccounts(); @@ -79,7 +79,16 @@ export class StreamOverlayComponent implements OnInit { return false; } + accountSelected(accountName: string): void { + this.loadAccount(accountName); + } + + hashtagSelected(hashtag: string): void { + } + private loadAccount(accountName: string): void { + this.account = null; + this.accountName = accountName; let selectedAccounts = this.toolsService.getSelectedAccounts(); if (selectedAccounts.length === 0) { diff --git a/src/app/components/stream/user-profile/user-profile.component.html b/src/app/components/stream/user-profile/user-profile.component.html index 20c9f289..bc773037 100644 --- a/src/app/components/stream/user-profile/user-profile.component.html +++ b/src/app/components/stream/user-profile/user-profile.component.html @@ -5,5 +5,6 @@

@{{account.acct}}

-

+ +
\ No newline at end of file diff --git a/src/app/components/stream/user-profile/user-profile.component.ts b/src/app/components/stream/user-profile/user-profile.component.ts index 0c0bf024..79397115 100644 --- a/src/app/components/stream/user-profile/user-profile.component.ts +++ b/src/app/components/stream/user-profile/user-profile.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { Account } from "../../../services/models/mastodon.interfaces"; @Component({ @@ -10,6 +10,9 @@ export class UserProfileComponent implements OnInit { account: Account; hasNote: boolean; + @Output() browseAccount = new EventEmitter(); + @Output() browseHashtag = new EventEmitter(); + @Input('currentAccount') set currentAccount(account: Account) { this.account = account; @@ -23,4 +26,11 @@ export class UserProfileComponent implements OnInit { ngOnInit() { } + accountSelected(accountName: string): void { + this.browseAccount.next(accountName); + } + + hashtagSelected(hashtag: string): void { + this.browseHashtag.next(hashtag); + } }