frontend function consolidation part 1

This commit is contained in:
Peter Papp
2021-03-16 08:31:42 +01:00
parent 803cc089bd
commit 1bb59854ea
26 changed files with 1855 additions and 1879 deletions
@@ -8,7 +8,7 @@
<!-- Colors Picker-->
<TabOption :title="$t('popup_rename.tab_color_title')" icon="folder">
<ColorPicker :picked-color="pickedColor" v-model="selectedColor"/>
<ColorPicker :picked-color="pickedColor" v-model="selectedColor" />
</TabOption>
</TabWrapper>
</template>
@@ -18,11 +18,11 @@ import EmojiPicker from '@/components/Others/EmojiPicker'
import ColorPicker from '@/components/Others/ColorPicker'
import TabWrapper from '@/components/Others/TabWrapper'
import TabOption from '@/components/Others/TabOption'
import { events } from '@/bus'
import {events} from '@/bus'
export default {
name: 'SetFolderIcon',
props: [ 'folderData' ],
props: ['folderData'],
components: {
EmojiPicker,
ColorPicker,
@@ -30,7 +30,7 @@ export default {
TabOption,
},
computed: {
pickedEmoji () {
pickedEmoji() {
// If is color not selected and emoji is selected, push picked emoji to EmojiPicker for the EmojiSelected input
return !this.selectedColor && this.selectedEmoji ? this.selectedEmoji : undefined
},
@@ -46,46 +46,44 @@ export default {
}
},
watch: {
selectedColor () {
selectedColor() {
let color = {'color': this.selectedColor}
if( this.selectedColor ) {
if (this.selectedColor) {
this.selectedEmoji = undefined
events.$emit('setFolderIcon', color )
events.$emit('setFolderIcon', color)
}
},
selectedEmoji () {
selectedEmoji() {
let emoji = { 'emoji': this.selectedEmoji }
let emoji = {'emoji': this.selectedEmoji}
if( this.selectedEmoji ) {
if (this.selectedEmoji) {
this.selectedColor = undefined
events.$emit('setFolderIcon', this.selectedEmoji ==='default' ? 'default' : emoji )
events.$emit('setFolderIcon', this.selectedEmoji === 'default' ? 'default' : emoji)
}
},
},
created() {
if(this.folderData) {
if (this.folderData) {
// If folder have already set some color set this color to selected color
this.folderData.icon_color ? this.selectedColor = this.folderData.icon_color : ''
this.folderData.color ? this.selectedColor = this.folderData.color : ''
// If folder have already set some emojit set this emoji to selected emoji
this.folderData.icon_emoji ? this.selectedEmoji = this.folderData.icon_emoji : ''
this.folderData.emoji ? this.selectedEmoji = this.folderData.emoji : ''
}
},
destroyed () {
if(this.folderData) {
destroyed() {
if (this.folderData) {
// After close SetFolderIcon set the saved folder icon for thumbnail
let color = {'color': this.folderData.icon_color }
let emoji = {'emoji': this.folderData.icon_emoji }
events.$emit('setFolderIcon', this.folderData.icon_emoji ? emoji : color )
let color = {'color': this.folderData.color}
let emoji = {'emoji': this.folderData.emoji}
events.$emit('setFolderIcon', this.folderData.emoji ? emoji : color)
}
}
}