Don't add array to array.
This commit is contained in:
parent
10112d05fd
commit
58ef27a765
2 changed files with 23 additions and 9 deletions
|
|
@ -355,8 +355,10 @@
|
||||||
</v-dialog>
|
</v-dialog>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<MessageOperationsBottomSheet ref="messageOperationsSheet"
|
<MessageOperationsBottomSheet
|
||||||
style="background-color:#f776777;">
|
ref="messageOperationsSheet"
|
||||||
|
style="background-color: #f776777"
|
||||||
|
>
|
||||||
<MessageOperationsPicker
|
<MessageOperationsPicker
|
||||||
v-on:close="showEmojiPicker = false"
|
v-on:close="showEmojiPicker = false"
|
||||||
v-if="selectedEvent"
|
v-if="selectedEvent"
|
||||||
|
|
@ -370,7 +372,7 @@
|
||||||
/>
|
/>
|
||||||
<VEmojiPicker
|
<VEmojiPicker
|
||||||
ref="emojiPicker"
|
ref="emojiPicker"
|
||||||
style="width: 100%;background-color:#ffffff;"
|
style="width: 100%; background-color: #ffffff"
|
||||||
@select="emojiSelected"
|
@select="emojiSelected"
|
||||||
/>
|
/>
|
||||||
</MessageOperationsBottomSheet>
|
</MessageOperationsBottomSheet>
|
||||||
|
|
@ -407,8 +409,11 @@
|
||||||
width="80%"
|
width="80%"
|
||||||
>
|
>
|
||||||
<v-card>
|
<v-card>
|
||||||
<v-card-title>{{ $t("voice_recorder.not_supported_title") }}</v-card-title>
|
<v-card-title>{{
|
||||||
<v-card-text>{{ $t("voice_recorder.not_supported_text") }}
|
$t("voice_recorder.not_supported_title")
|
||||||
|
}}</v-card-title>
|
||||||
|
<v-card-text
|
||||||
|
>{{ $t("voice_recorder.not_supported_text") }}
|
||||||
</v-card-text>
|
</v-card-text>
|
||||||
<v-divider></v-divider>
|
<v-divider></v-divider>
|
||||||
<v-card-actions>
|
<v-card-actions>
|
||||||
|
|
@ -692,7 +697,8 @@ export default {
|
||||||
if (ref && ref[0]) {
|
if (ref && ref[0]) {
|
||||||
if (this.showContextMenuAnchor) {
|
if (this.showContextMenuAnchor) {
|
||||||
var rectAnchor = this.showContextMenuAnchor.getBoundingClientRect();
|
var rectAnchor = this.showContextMenuAnchor.getBoundingClientRect();
|
||||||
var rectChat = this.$refs.messageOperationsStrut.getBoundingClientRect();
|
var rectChat =
|
||||||
|
this.$refs.messageOperationsStrut.getBoundingClientRect();
|
||||||
top = rectAnchor.top - rectChat.top;
|
top = rectAnchor.top - rectChat.top;
|
||||||
left = rectAnchor.left - rectChat.left;
|
left = rectAnchor.left - rectChat.left;
|
||||||
if (left + 250 > rectChat.right) {
|
if (left + 250 > rectChat.right) {
|
||||||
|
|
@ -711,7 +717,8 @@ export default {
|
||||||
if (ref && ref[0]) {
|
if (ref && ref[0]) {
|
||||||
if (this.showAvatarMenuAnchor) {
|
if (this.showAvatarMenuAnchor) {
|
||||||
var rectAnchor = this.showAvatarMenuAnchor.getBoundingClientRect();
|
var rectAnchor = this.showAvatarMenuAnchor.getBoundingClientRect();
|
||||||
var rectChat = this.$refs.avatarOperationsStrut.getBoundingClientRect();
|
var rectChat =
|
||||||
|
this.$refs.avatarOperationsStrut.getBoundingClientRect();
|
||||||
top = rectAnchor.top - rectChat.top;
|
top = rectAnchor.top - rectChat.top;
|
||||||
left = rectAnchor.left - rectChat.left;
|
left = rectAnchor.left - rectChat.left;
|
||||||
// if (left + 250 > rectChat.right) {
|
// if (left + 250 > rectChat.right) {
|
||||||
|
|
@ -1665,7 +1672,10 @@ export default {
|
||||||
if (this.$refs.emojiPicker) {
|
if (this.$refs.emojiPicker) {
|
||||||
this.recentEmojis = this.$refs.emojiPicker.mapEmojis["Frequently"];
|
this.recentEmojis = this.$refs.emojiPicker.mapEmojis["Frequently"];
|
||||||
if (this.recentEmojis.length < 20) {
|
if (this.recentEmojis.length < 20) {
|
||||||
this.recentEmojis.push(this.$refs.emojiPicker.mapEmojis["Peoples"]);
|
let peoples = this.$refs.emojiPicker.mapEmojis["Peoples"];
|
||||||
|
for (var p of peoples) {
|
||||||
|
this.recentEmojis.push(p);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,10 @@ module.exports = {
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
|
configureWebpack: {
|
||||||
|
devtool: 'source-map'
|
||||||
|
},
|
||||||
|
|
||||||
devServer: {
|
devServer: {
|
||||||
//https: true
|
//https: true
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue