mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
parent 40195fb8dc 3e43ae7bd6
commit 12933b5105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
apps/files_sharing/js/dist/files_sharing_tab.js vendored
View File

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/files_sharing_tab.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
apps/files_sharing/js/dist/personal-settings.js vendored
View File

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/personal-settings.js.map vendored
View File

File diff suppressed because one or more lines are too long

7
apps/files_sharing/src/components/SharingEntryLink.vue
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')
}
},

20
apps/files_sharing/src/mixins/SharesMixin.js
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
},
},
@ -117,10 +117,10 @@ export default {
// fallback to default in case of unavailable data
return {
days: window.dayNamesShort
? window.dayNamesShort // provided by nextcloud
? window.dayNamesShort // provided by nextcloud
: ['Sun.', 'Mon.', 'Tue.', 'Wed.', 'Thu.', 'Fri.', 'Sat.'],
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.'],
placeholder: {
date: 'Select Date', // TODO: Translate
@ -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
*/

4
apps/files_sharing/src/models/Share.js
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 ---------------------------------------------

2
apps/files_sharing/src/views/SharingLinkList.vue
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"