Merge pull request #18814 from nextcloud/backport/18771/master

[master] Fix sharing note placeholder
This commit is contained in:
Roeland Jago Douma 2020-01-11 08:19:18 +01:00 committed by GitHub
commit 12933b5105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 43 additions and 32 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -242,9 +242,10 @@
}"
:class="{ error: errors.note}"
:disabled="saving"
:value.sync="share.note"
:placeholder="t('files_sharing', 'Enter a note for the share recipient')"
:value="share.note"
icon="icon-edit"
@update:value="debounceQueueUpdate('note')" />
@update:value="onNoteChange" />
</template>
<!-- external sharing via url (social...) -->
@ -733,7 +734,7 @@ export default {
*/
onPasswordSubmit() {
if (this.hasUnsavedPassword) {
this.share.password = this.share.newPassword
this.share.password = this.share.newPassword.trim()
this.queueUpdate('password')
}
},

View File

@ -88,12 +88,12 @@ export default {
*/
hasNote: {
get: function() {
return !!this.share.note
return this.share.note !== ''
},
set: function(enabled) {
this.share.note = enabled
? t('files_sharing', 'Enter a note for the share recipient')
: ''
? null // enabled but user did not changed the content yet
: '' // empty = no note = disabled
},
},
@ -182,6 +182,16 @@ export default {
this.queueUpdate('expireDate')
},
/**
* When the note change, we trim, save and dispatch
*
* @param {string} note the note
*/
onNoteChange: debounce(function(note) {
this.share.note = note.trim()
this.queueUpdate('note')
}, 500),
/**
* Delete share button handler
*/

View File

@ -250,7 +250,7 @@ export default class Share {
* @memberof Share
*/
set note(note) {
this.#share.note = note.trim()
this.#share.note = note
}
/**
@ -303,7 +303,7 @@ export default class Share {
* @memberof Share
*/
set password(password) {
this.#share.password = password.trim()
this.#share.password = password
}
// SHARED ITEM DATA ---------------------------------------------

View File

@ -21,7 +21,7 @@
-->
<template>
<ul class="sharing-link-list" v-if="canLinkShare">
<ul v-if="canLinkShare" class="sharing-link-list">
<!-- If no link shares, show the add link default entry -->
<SharingEntryLink v-if="!hasLinkShares && canReshare"
:can-reshare="canReshare"