mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-05-13 08:45:01 +00:00
Merge remote-tracking branch 'origin/version-v1.8.1' into version-v1.8.1
# Conflicts: # app/Http/Controllers/FileFunctions/ShareController.php # public/mix-manifest.json
This commit is contained in:
@@ -42,6 +42,9 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
removeEmail( email ) {
|
removeEmail( email ) {
|
||||||
this.emails = this.emails.filter( item => item !== email )
|
this.emails = this.emails.filter( item => item !== email )
|
||||||
|
|
||||||
|
// After romove email send new emails list to parent
|
||||||
|
events.$emit( 'emailsInputValues', this.emails )
|
||||||
},
|
},
|
||||||
removeLastEmail( event ) {
|
removeLastEmail( event ) {
|
||||||
|
|
||||||
@@ -59,6 +62,11 @@ export default {
|
|||||||
// Check if is after @ some dot, if email have @ anf if dont have more like one
|
// Check if is after @ some dot, if email have @ anf if dont have more like one
|
||||||
if ( lastDot < at || at === -1 || this.email.match(/@/g).length > 1 ) return
|
if ( lastDot < at || at === -1 || this.email.match(/@/g).length > 1 ) return
|
||||||
|
|
||||||
|
// First email dont need to be separated by comma or space to be sended
|
||||||
|
if( this.emails.length === 0 )
|
||||||
|
events.$emit('emailsInputValues', [this.email])
|
||||||
|
|
||||||
|
|
||||||
// After come or backspace push the single email to array or emails
|
// After come or backspace push the single email to array or emails
|
||||||
if ( this.email.includes(',') || this.email.includes(' ') ) {
|
if ( this.email.includes(',') || this.email.includes(' ') ) {
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
<!--<SetFolderIcon v-if="isMoreOptions" :folderData="pickedItem" :unique_id="pickedItem.unique_id" />-->
|
<!--<SetFolderIcon v-if="isMoreOptions" :folderData="pickedItem" :unique_id="pickedItem.unique_id" />-->
|
||||||
|
|
||||||
<ActionButton v-if="pickedItem.type === 'folder'" @click.native.stop="moreOptions" :icon="isMoreOptions ? 'x' : 'pencil-alt'">{{ moreOptionsTitle }}</ActionButton>
|
<!-- <ActionButton v-if="pickedItem.type === 'folder'" @click.native.stop="moreOptions" :icon="isMoreOptions ? 'x' : 'pencil-alt'">{{ moreOptionsTitle }}</ActionButton> -->
|
||||||
|
|
||||||
</ValidationObserver>
|
</ValidationObserver>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user