diff options
| author | taehoon <th.dev91@gmail.com> | 2019-04-26 15:46:40 -0400 |
|---|---|---|
| committer | taehoon <th.dev91@gmail.com> | 2019-05-15 12:04:26 -0400 |
| commit | 32be0e15d11c14513ff4fdc984aeaa4a5f462eac (patch) | |
| tree | a82590e6a6ef1cd97824167f83a8ffd66cc17ac5 /src | |
| parent | f8186bfc744c66426635208838c3e2a4dcbecfd2 (diff) | |
use pinned property from status directly
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/conversation/conversation.js | 3 | ||||
| -rw-r--r-- | src/components/conversation/conversation.vue | 1 | ||||
| -rw-r--r-- | src/components/status/status.js | 3 | ||||
| -rw-r--r-- | src/components/status/status.vue | 2 | ||||
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 1 |
5 files changed, 3 insertions, 7 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index fc239ee9..ffeb7244 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -41,8 +41,7 @@ const conversation = { props: [ 'statusoid', 'collapsable', - 'isPage', - 'pinned' + 'isPage' ], created () { if (this.isPage) { diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 40011113..d04ff722 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -13,7 +13,6 @@ :key="status.id" :inlineExpanded="collapsable && isExpanded" :statusoid="status" - :pinned="pinned" :expandable='!isExpanded' :focused="focused(status.id)" :inConversation="isExpanded" diff --git a/src/components/status/status.js b/src/components/status/status.js index fa4b426c..09a2a010 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -26,8 +26,7 @@ const Status = { 'replies', 'isPreview', 'noHeading', - 'inlineExpanded', - 'pinned' + 'inlineExpanded' ], data () { return { diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 1644f6b0..41662576 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -13,7 +13,7 @@ </div> </template> <template v-else> - <div v-if="pinned" class="status-pin"> + <div v-if="statusoid.pinned" class="status-pin"> <i class="fa icon-pin faint"></i> <span class="faint">Pinned</span> </div> diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 46561e2a..1e104403 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -10,7 +10,6 @@ class="status-fadein" :key="status.id" :statusoid="status" - :pinned="true" :collapsable="true" /> </div> |