add to FileItemList/Grid function to unfocuse new foler name input, ThumbnaillItem folderIconHandle revision

This commit is contained in:
Milos Holba
2021-01-31 14:39:44 +01:00
parent 689b064756
commit 9c147165e1
4 changed files with 155 additions and 306 deletions

View File

@@ -176,6 +176,10 @@ export default {
events.$emit('unClick')
if (!this.$isMobile()) {
// After click deselect new folder rename input
document.getSelection().removeAllRanges();
if (e.ctrlKey || e.metaKey && !e.shiftKey) {
// Click + Ctrl
if (this.fileInfoDetail.some(item => item.unique_id === this.data.unique_id)) {

View File

@@ -181,6 +181,9 @@ export default {
if (!this.$isMobile()) {
// After click deselect new folder rename input
document.getSelection().removeAllRanges();
if ((e.ctrlKey || e.metaKey) && !e.shiftKey) {
// Click + Ctrl
@@ -285,8 +288,6 @@ export default {
this.itemName = this.data.name
events.$on('newFolder:focus', (unique_id) => {
if(this.data.unique_id == unique_id) {

View File

@@ -16,7 +16,7 @@
<!--Else show only folder icon-->
<FontAwesomeIcon ref="folderIcon" v-if="isFolder && !folderIconHandle" class="folder-icon" icon="folder"/>
<div id="thumbnail-emoji" v-if="isFolder && folderIconHandle" class="folder-emoji">{{folderIconHandle}}</div>
<div v-if="isFolder && folderIconHandle" class="folder-emoji">{{folderIconHandle}}</div>
</div>
<!--Name-->
@@ -50,40 +50,29 @@
computed: {
...mapGetters(['currentFolder']),
// TODO: revision
folderIconHandle(){
let icon = undefined
this.$emojisCustomize()
// Set icon folder if set folder from rename popup
if(this.setFolderIcon){
if(this.setFolderIcon.color)
this.$nextTick(() => {
return this.setFolderIcon.emoji
? this.setFolderIcon.emoji.char
: this.$nextTick(() => {
this.$refs.folderIcon.firstElementChild.style.fill = `${this.setFolderIcon.color}`
})
icon = false
if(this.setFolderIcon.emoji)
icon = this.setFolderIcon.emoji.char
})
}
// If folder have already set some icon
if(!this.setFolderIcon && (this.item.icon_emoji || this.item.icon_color)){
if(this.item.icon_emoji !== null)
icon = JSON.parse(this.item.icon_emoji).char
if(this.item.icon_color !== null){
this.$nextTick(() => {
return this.item.icon_emoji
? JSON.parse(this.item.icon_emoji).char
: this.$nextTick(() => {
this.$refs.folderIcon.firstElementChild.style.fill = `${this.item.icon_color}`
})
icon = false
}
}
return icon
},
isFolder() {
return this.item.type === 'folder'