From 4ba42a0d0c4c276c3107217e985d062731a69836 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Tue, 1 Oct 2019 00:24:20 -0400 Subject: [PATCH 1/7] removed remote video border --- .../stream/status/card/card.component.html | 4 ---- .../stream/status/card/card.component.scss | 12 ++++++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/components/stream/status/card/card.component.html b/src/app/components/stream/status/card/card.component.html index 73935278..dfb348b3 100644 --- a/src/app/components/stream/status/card/card.component.html +++ b/src/app/components/stream/status/card/card.component.html @@ -29,10 +29,6 @@
- -
\ No newline at end of file diff --git a/src/app/components/stream/status/card/card.component.scss b/src/app/components/stream/status/card/card.component.scss index a32ff790..ca8f8506 100644 --- a/src/app/components/stream/status/card/card.component.scss +++ b/src/app/components/stream/status/card/card.component.scss @@ -1,13 +1,15 @@ @import "variables"; -// @import "mixins"; -.card { - border: 1px solid $card-border-color; - background-color: $column-background; +.card { border-radius: 3px; + border: 0px; + transition: all .2s; white-space: nowrap; overflow: hidden; + + background-color: $column-background; + // background-color: red; &:hover { background-color: lighten($column-background, 5); @@ -18,6 +20,8 @@ text-decoration: none; color: whitesmoke; + border: 1px solid $card-border-color; + &--image { width: 55px; height: 55px; From 8c36620b0ab408c56aefee505a14c8a01d5d5715 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Tue, 1 Oct 2019 00:40:23 -0400 Subject: [PATCH 2/7] fix link/video borders --- .../stream/status/card/card.component.html | 34 +++++++++---------- .../stream/status/card/card.component.scss | 8 ++--- src/sass/_variables.scss | 2 +- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/app/components/stream/status/card/card.component.html b/src/app/components/stream/status/card/card.component.html index dfb348b3..7d402c28 100644 --- a/src/app/components/stream/status/card/card.component.html +++ b/src/app/components/stream/status/card/card.component.html @@ -1,34 +1,34 @@ -
- - -
- +
+ + +
+
-

{{ card.title }}

- {{ host }} +

{{ card.title }}

+ {{ host }} -
+
-
-
-
- +
+
+
+ - + - +
- +
-
+
-
+
\ No newline at end of file diff --git a/src/app/components/stream/status/card/card.component.scss b/src/app/components/stream/status/card/card.component.scss index ca8f8506..82eb82e4 100644 --- a/src/app/components/stream/status/card/card.component.scss +++ b/src/app/components/stream/status/card/card.component.scss @@ -1,15 +1,12 @@ @import "variables"; -.card { +.card-data { border-radius: 3px; border: 0px; transition: all .2s; white-space: nowrap; - overflow: hidden; - - background-color: $column-background; - // background-color: red; + overflow: hidden; &:hover { background-color: lighten($column-background, 5); @@ -19,6 +16,7 @@ display: block; text-decoration: none; color: whitesmoke; + overflow: auto; border: 1px solid $card-border-color; diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss index 094f7a36..6db43873 100644 --- a/src/sass/_variables.scss +++ b/src/sass/_variables.scss @@ -48,7 +48,7 @@ $button-border-color: #303957; $column-background: #0f111a; -$card-border-color: #1e2435; +$card-border-color: #2b344d; $context-menu-background: #d9e1e8; $context-menu-background-hover: #a9c9e6; From ed1e52232d5cad48f43406816e02fe5908895fac Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Tue, 1 Oct 2019 00:55:20 -0400 Subject: [PATCH 3/7] fix gotoup in firefox --- .../stream/stream-statuses/stream-statuses.component.ts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/app/components/stream/stream-statuses/stream-statuses.component.ts b/src/app/components/stream/stream-statuses/stream-statuses.component.ts index 858e009b..af32b6d9 100644 --- a/src/app/components/stream/stream-statuses/stream-statuses.component.ts +++ b/src/app/components/stream/stream-statuses/stream-statuses.component.ts @@ -180,13 +180,7 @@ export class StreamStatusesComponent implements OnInit, OnDestroy { top: 0, behavior: 'smooth' }); - }, 0); - setTimeout(() => { - stream.scrollTo({ - top: 0, - behavior: 'auto' - }); - }, 250); + }, 10); return false; } From e88a568a99e3da9f2c7e48a4a4804d29e44a2fa2 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Fri, 4 Oct 2019 23:05:36 -0400 Subject: [PATCH 4/7] fix autosuggest --- .../autosuggest/autosuggest.component.ts | 1 + .../create-status/create-status.component.ts | 45 ++++++++++++++----- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/app/components/create-status/autosuggest/autosuggest.component.ts b/src/app/components/create-status/autosuggest/autosuggest.component.ts index cd4097fd..4dd404d3 100644 --- a/src/app/components/create-status/autosuggest/autosuggest.component.ts +++ b/src/app/components/create-status/autosuggest/autosuggest.component.ts @@ -29,6 +29,7 @@ export class AutosuggestComponent implements OnInit, OnDestroy { this._pattern = value; this.analysePattern(value); } else { + this._pattern = null; this.accounts.length = 0; this.hashtags.length = 0; } diff --git a/src/app/components/create-status/create-status.component.ts b/src/app/components/create-status/create-status.component.ts index 40e99007..b379f0fc 100644 --- a/src/app/components/create-status/create-status.component.ts +++ b/src/app/components/create-status/create-status.component.ts @@ -223,23 +223,50 @@ export class CreateStatusComponent implements OnInit, OnDestroy { if (!this.statusLoaded) return; const caretPosition = this.replyElement.nativeElement.selectionStart; - const word = this.getWordByPos(status, caretPosition); - if (word && word.length > 0 && (word.startsWith('@') || word.startsWith('#'))) { + + const lastChar = status.substr(caretPosition - 1, 1); + const lastCharIsSpace = lastChar === ' '; + + const splitedStatus = status.split(/(\r\n|\n|\r)/); + let offset = 0; + let currentSection = ''; + for(let x of splitedStatus){ + const sectionLength = [...x].length; + if(offset + sectionLength >= caretPosition){ + currentSection = x; + break; + } else { + offset += sectionLength; + } + }; + + const word = this.getWordByPos(currentSection, caretPosition - offset); + if (!lastCharIsSpace && word && word.length > 0 && (word.startsWith('@') || word.startsWith('#'))) { this.autosuggestData = word; return; } this.autosuggestData = null; + this.hasSuggestions = false; } private getWordByPos(str, pos) { - str = str.replace(/(\r\n|\n|\r)/gm, ""); - var left = str.substr(0, pos); - var right = str.substr(pos); + var preText = str.substring(0, pos); + if (preText.indexOf(" ") > 0) { + var words = preText.split(" "); + return words[words.length - 1]; //return last word + } + else { + return preText; + } - left = left.replace(/^.+ /g, ""); - right = right.replace(/ .+$/g, ""); + // // str = str.replace(/(\r\n|\n|\r)/gm, ""); + // var left = str.substr(0, pos); + // var right = str.substr(pos); - return left + right; + // left = left.replace(/^.+ /g, ""); + // right = right.replace(/ .+$/g, ""); + + // return left + right; } private focus(caretPos = null) { @@ -477,7 +504,6 @@ export class CreateStatusComponent implements OnInit, OnDestroy { return false; } - private sendStatus(account: AccountInfo, status: string, visibility: VisibilityEnum, title: string, previousStatus: Status, attachments: Attachment[], poll: PollParameters, scheduledAt: string): Promise { let parsedStatus = this.parseStatus(status); let resultPromise = Promise.resolve(previousStatus); @@ -567,7 +593,6 @@ export class CreateStatusComponent implements OnInit, OnDestroy { return status.split(' ').filter(x => x.indexOf('@') === 0 && x.length > 1); } - suggestionSelected(selection: AutosuggestSelection) { if (this.status.includes(selection.pattern)) { From 0fe3cbce6202b9a894af1fd801bbc6607d7c6909 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Fri, 4 Oct 2019 23:33:08 -0400 Subject: [PATCH 5/7] fix scheduler bottom border --- src/app/components/create-status/create-status.component.scss | 3 ++- .../status-scheduler/status-scheduler.component.scss | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/components/create-status/create-status.component.scss b/src/app/components/create-status/create-status.component.scss index 340d7516..5f38e703 100644 --- a/src/app/components/create-status/create-status.component.scss +++ b/src/app/components/create-status/create-status.component.scss @@ -200,7 +200,8 @@ $counter-width: 90px; .scheduler { display: block; - margin: 0 5px; + margin: 0 5px; + border-bottom: 1px solid whitesmoke; } @import '~@angular/cdk/overlay-prebuilt.css'; diff --git a/src/app/components/create-status/status-scheduler/status-scheduler.component.scss b/src/app/components/create-status/status-scheduler/status-scheduler.component.scss index b9dd42df..0576d20d 100644 --- a/src/app/components/create-status/status-scheduler/status-scheduler.component.scss +++ b/src/app/components/create-status/status-scheduler/status-scheduler.component.scss @@ -2,8 +2,6 @@ .scheduler { background-color: $scheduler-background; - //margin: 0 5px; - border-bottom: 1px solid whitesmoke; &__input { color: whitesmoke; From f9bf362935902e16ae8a1e53697c3384a99dac34 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Mon, 7 Oct 2019 23:46:03 -0400 Subject: [PATCH 6/7] fix thread auto scroll --- src/app/components/stream/thread/thread.component.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/components/stream/thread/thread.component.ts b/src/app/components/stream/thread/thread.component.ts index 8d660644..088c4963 100644 --- a/src/app/components/stream/thread/thread.component.ts +++ b/src/app/components/stream/thread/thread.component.ts @@ -9,6 +9,7 @@ import { NotificationService, NewReplyData } from '../../../services/notificatio import { AccountInfo } from '../../../states/accounts.state'; import { StatusWrapper } from '../../../models/common.model'; import { StatusComponent } from '../status/status.component'; +import scrollIntoView from 'scroll-into-view-if-needed'; @Component({ selector: 'app-thread', @@ -177,11 +178,11 @@ export class ThreadComponent implements OnInit, OnDestroy { setTimeout(() => { const el = this.statusChildren.toArray()[position]; el.isSelected = true; - // el.elem.nativeElement.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'start' }); - // el.elem.nativeElement.scrollIntoView({ behavior: 'auto', block: 'start', inline: 'nearest' }); - // el.elem.nativeElement.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'start' }); - el.elem.nativeElement.scrollIntoViewIfNeeded({ behavior: 'auto', block: 'start', inline: 'nearest' }); - }, 0); + + //el.elem.nativeElement.scrollIntoViewIfNeeded({ behavior: 'auto', block: 'start', inline: 'nearest' }); + + scrollIntoView(el.elem.nativeElement, { behavior: 'smooth', block: 'nearest'}); + }, 250); }) .catch((err: HttpErrorResponse) => { this.notificationService.notifyHttpError(err, currentAccount); From 81d716279a2e53ddc1459189c9a919cdc1fc286e Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Mon, 7 Oct 2019 23:51:54 -0400 Subject: [PATCH 7/7] fix autoscroll after CS removal --- src/app/components/stream/thread/thread.component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/components/stream/thread/thread.component.ts b/src/app/components/stream/thread/thread.component.ts index 088c4963..5dd3e0a4 100644 --- a/src/app/components/stream/thread/thread.component.ts +++ b/src/app/components/stream/thread/thread.component.ts @@ -219,6 +219,11 @@ export class ThreadComponent implements OnInit, OnDestroy { const statuses = this.statusChildren.toArray(); statuses.forEach(x => { x.removeContentWarning(); + if(x.isSelected){ + setTimeout(() => { + scrollIntoView(x.elem.nativeElement, { behavior: 'auto', block: 'nearest'}); + }, 0); + } }); this.hasContentWarnings = false; return false;