aboutsummaryrefslogtreecommitdiff
path: root/src/components/conversation
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/conversation')
-rw-r--r--src/components/conversation/conversation.js18
-rw-r--r--src/components/conversation/conversation.vue40
2 files changed, 3 insertions, 55 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 89fcfddb..9d9f7bbe 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,4 +1,4 @@
-import { reduce, find, filter, sortBy } from 'lodash'
+import { reduce, filter, sortBy } from 'lodash'
import { statusType } from '../../modules/statuses.js'
import Status from '../status/status.vue'
@@ -10,12 +10,7 @@ const sortAndFilterConversation = (conversation) => {
const conversation = {
data () {
return {
- highlight: null,
- preview: {
- x: 0,
- y: 0,
- status: null
- }
+ highlight: null
}
},
props: [
@@ -86,15 +81,6 @@ const conversation = {
},
setHighlight (id) {
this.highlight = Number(id)
- },
- setPreview (id, x, y) {
- if (id) {
- this.preview.x = x
- this.preview.y = y
- this.preview.status = find(this.conversation, { id: id })
- } else {
- this.preview.status = null
- }
}
}
}
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 3dea4985..201afcd5 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -8,48 +8,10 @@
</div>
<div class="panel-body">
<div class="timeline">
- <status v-for="status in conversation" @goto="setHighlight" :key="status.id" @preview="setPreview" :statusoid="status" :expandable='false' :focused="focused(status.id)" :inConversation='true' :highlight="highlight" :replies="getReplies(status.id)"></status>
- </div>
- </div>
- <div class="status-preview base00-background base03-border" :style="{ left: preview.x + 'px', top: preview.y + 'px'}" v-if="preview.status">
- <img class="avatar" :src="preview.status.user.profile_image_url_original">
- <div class="text">
- <h4>
- {{ preview.status.user.name }}
- <small><a>{{ preview.status.user.screen_name}}</a></small>
- </h4>
- <div @click.prevent="linkClicked" class="status-content" v-html="preview.status.statusnet_html"></div>
+ <status v-for="status in conversation" @goto="setHighlight" :key="status.id" :statusoid="status" :expandable='false' :focused="focused(status.id)" :inConversation='true' :highlight="highlight" :replies="getReplies(status.id)"></status>
</div>
</div>
</div>
</template>
<script src="./conversation.js"></script>
-
-<style lang="scss">
- .status-preview {
- position: absolute;
- max-width: 35em;
- padding: 0.5em;
- display: flex;
- border-color: inherit;
- border-style: solid;
- border-width: 1px;
- border-radius: 4px;
- box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.5);
- .avatar {
- width: 32px;
- height: 32px;
- border-radius: 50%;
- }
- .text {
- h4 {
- margin-bottom: 0.4em;
- small {
- font-weight: lighter;
- }
- }
- padding: 0 0.5em 0.5em 0.5em;
- }
- }
-</style>