Skip to content

Commit 821ec66

Browse files
Fixed remaining rebase issues.
1 parent 38cd562 commit 821ec66

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

src/ChatWindow.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
:image-url="showingChatList ? chatListImageUrl : titleImageUrl"
88
@close="$emit('close')"
99
:colors="colors"
10-
:disable-user-list-toggle="disableUserListToggle || showingChatList"
10+
:disable-list-toggle="disableUserListToggle || showingChatList"
1111
@toggleUserListMessageList="handleToggleUserListMessageList"
1212
@showChatList="handleShowChatList"
1313
>
@@ -77,6 +77,7 @@
7777
</template>
7878

7979
<script>
80+
import {mapState} from './store/'
8081
import Header from './Header.vue'
8182
import MessageList from './MessageList.vue'
8283
import UserInput from './UserInput.vue'
@@ -211,7 +212,8 @@ export default {
211212
},
212213
showingMessageList() {
213214
return this.state == uiState.MESSAGE_LIST
214-
}
215+
},
216+
...mapState(['titleImageUrl', 'disableUserListToggle'])
215217
},
216218
methods: {
217219
handleToggleUserListMessageList() {

src/Header.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88
<slot>
99
<img v-if="titleImageUrl" class="sc-header--img" :src="titleImageUrl" alt="" />
10-
<div v-if="!disableUserListToggle" class="sc-header--title enabled" @click="toggleUserListMessageList">
10+
<div v-if="!disableListToggle" class="sc-header--title enabled" @click="toggleUserListMessageList">
1111
{{ title }}
1212
</div>
1313
<div v-else class="sc-header--title">{{ title }}</div>
@@ -47,9 +47,13 @@ export default {
4747
type: Boolean,
4848
default: false
4949
},
50+
disableListToggle: {
51+
type: Boolean,
52+
required: true
53+
},
5054
},
5155
computed: {
52-
...mapState(['disableUserListToggle', 'titleImageUrl', 'showCloseButton'])
56+
...mapState(['titleImageUrl', 'showCloseButton'])
5357
},
5458
methods: {
5559
toggleUserListMessageList() {

src/Launcher.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<img v-else class="sc-open-icon" :src="icons.open.img" :alt="icons.open.name" />
1515
</div>
1616
<ChatWindow
17-
:multiple-chats="multipleChats"
1817
:message-list="messageList"
1918
:on-user-input-submit="onMessageWasSent"
2019
:participants="participants"

0 commit comments

Comments
 (0)