aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/components/status/status.js11
-rw-r--r--src/components/user_finder/user_finder.js1
2 files changed, 2 insertions, 10 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 55976b8b..12f3bb25 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -92,7 +92,7 @@ const Status = {
},
gotoOriginal (id) {
// only handled by conversation, not status_or_conversation
- if (this.expanded) {
+ if (this.inConversation) {
this.$emit('goto', id)
}
},
@@ -122,18 +122,9 @@ const Status = {
} else if (this.preview.id !== targetId) {
this.preview = find(statuses, { 'id': targetId })
}
- /*
- if (this.$store.state.config.hoverPreview) {
- let rect = event.target.getBoundingClientRect()
- this.$emit('preview', Number(id), rect.left + 20, rect.top + 20 + window.pageYOffset)
- }
- */
},
replyLeave () {
this.showPreview = false
- /*
- this.$emit('preview', 0, 0, 0)
- */
}
},
watch: {
diff --git a/src/components/user_finder/user_finder.js b/src/components/user_finder/user_finder.js
index abd40d51..a743b5f6 100644
--- a/src/components/user_finder/user_finder.js
+++ b/src/components/user_finder/user_finder.js
@@ -7,6 +7,7 @@ const UserFinder = {
}),
methods: {
findUser (username) {
+ username = username[0] === '@' ? username.slice(1) : username
this.loading = true
this.$store.state.api.backendInteractor.externalProfile(username)
.then((user) => {