Fix sharing note placeholder

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2020-01-09 11:50:56 +01:00 committed by Backportbot
parent 4b28da1dd9
commit 8eded83d50
4 changed files with 21 additions and 11 deletions

View File

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

View File

@ -88,12 +88,12 @@ export default {
*/ */
hasNote: { hasNote: {
get: function() { get: function() {
return !!this.share.note return this.share.note !== ''
}, },
set: function(enabled) { set: function(enabled) {
this.share.note = 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
}, },
}, },
@ -117,10 +117,10 @@ export default {
// fallback to default in case of unavailable data // fallback to default in case of unavailable data
return { return {
days: window.dayNamesShort days: window.dayNamesShort
? window.dayNamesShort // provided by nextcloud ? window.dayNamesShort // provided by nextcloud
: ['Sun.', 'Mon.', 'Tue.', 'Wed.', 'Thu.', 'Fri.', 'Sat.'], : ['Sun.', 'Mon.', 'Tue.', 'Wed.', 'Thu.', 'Fri.', 'Sat.'],
months: window.monthNamesShort months: window.monthNamesShort
? window.monthNamesShort // provided by nextcloud ? window.monthNamesShort // provided by nextcloud
: ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'], : ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'],
placeholder: { placeholder: {
date: 'Select Date', // TODO: Translate date: 'Select Date', // TODO: Translate
@ -182,6 +182,16 @@ export default {
this.queueUpdate('expireDate') 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 * Delete share button handler
*/ */

View File

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

View File

@ -21,7 +21,7 @@
--> -->
<template> <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 --> <!-- If no link shares, show the add link default entry -->
<SharingEntryLink v-if="!hasLinkShares && canReshare" <SharingEntryLink v-if="!hasLinkShares && canReshare"
:can-reshare="canReshare" :can-reshare="canReshare"