diff --git a/src/components/call/CscCall.vue b/src/components/call/CscCall.vue index f109b8f5..7e346b42 100644 --- a/src/components/call/CscCall.vue +++ b/src/components/call/CscCall.vue @@ -561,10 +561,14 @@ export default { this.fetchLocalMediaWrapperWidth() this.fetchRemoteMediaWrapperWidth() } + const startCall = (media) => { + this.startCall(media) + } fetchMediaWrapperWidth() this.$root.$on('window-resized', fetchMediaWrapperWidth) this.$root.$on('content-resized', fetchMediaWrapperWidth) this.$root.$on('orientation-changed', fetchMediaWrapperWidth) + this.$root.$on('start-call', startCall) }, methods: { fetchLocalMediaWrapperWidth () { diff --git a/src/helpers/validation.js b/src/helpers/validation.js index cf04e92b..5a624e7e 100644 --- a/src/helpers/validation.js +++ b/src/helpers/validation.js @@ -1,6 +1,7 @@ const userInfoRegExp = new RegExp(/^[-_.!~*'&=+$,;?/%a-zA-Z0-9]+$/) const macAddressRegExp = new RegExp(/^(?:[0-9A-Fa-f]{2}(?=([-:]|))(?:\1[0-9A-Fa-f]{2}){5})$/) +const phoneNumberRegExp = new RegExp(/^\+[0-9]?()[0-9](\s|\S)(\d[0-9]{9})$/) export function userInfo (value) { return userInfoRegExp.test(value) @@ -18,7 +19,7 @@ export function customMacAddress (value) { } export function isPhone (value) { - return /^\+[0-9]?()[0-9](\s|\S)(\d[0-9]{9})$/.test(value) + return phoneNumberRegExp.test(value) } export function inRange (value, min, max, between) { diff --git a/src/pages/CscPageConversations.vue b/src/pages/CscPageConversations.vue index 2f7d8aed..739e14bf 100644 --- a/src/pages/CscPageConversations.vue +++ b/src/pages/CscPageConversations.vue @@ -16,7 +16,8 @@ :default="tab.value === selectedTab" :disable="listLoading" @click="selectTab(tab.value)" - /> + /> +