vertumnus
/
primevue-mirror
mirror of https://github.com/primefaces/primevue.git
1
0
Fork 0
Code Packages Releases Activity

Refactor

pull/2835/head
mertsincan 2022-08-01 00:49:09 +01:00
parent b200a25cb8
commit 31148c1a9a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/dropdown/Dropdown.vue
View File

@ -584,6 +584,7 @@ export default {
this.unbindOutsideClickListener(); this.unbindOutsideClickListener();
this.unbindScrollListener(); this.unbindScrollListener();
this.unbindResizeListener(); this.unbindResizeListener();
this.$emit('hide'); this.$emit('hide');
this.overlay = null; this.overlay = null;
}, },
@ -849,7 +850,7 @@ export default {
return this.emptySelectionMessage || this.$primevue.config.locale.emptySelectionMessage; return this.emptySelectionMessage || this.$primevue.config.locale.emptySelectionMessage;
}, },
selectedMessageText() { selectedMessageText() {
return ObjectUtils.isNotEmpty(this.modelValue) ? this.selectionMessageText.replaceAll('{0}', '1') : this.emptySelectionMessageText; return this.hasSelectedOption ? this.selectionMessageText.replaceAll('{0}', '1') : this.emptySelectionMessageText;
}, },
focusedOptionId() { focusedOptionId() {
return this.focusedOptionIndex !== -1 ? `${this.id}_${this.focusedOptionIndex}` : null; return this.focusedOptionIndex !== -1 ? `${this.id}_${this.focusedOptionIndex}` : null;

2
src/components/listbox/Listbox.vue
View File

@ -680,7 +680,7 @@ export default {
return this.emptySelectionMessage || this.$primevue.config.locale.emptySelectionMessage; return this.emptySelectionMessage || this.$primevue.config.locale.emptySelectionMessage;
}, },
selectedMessageText() { selectedMessageText() {
return ObjectUtils.isNotEmpty(this.modelValue) ? this.selectionMessageText.replaceAll('{0}', this.multiple ? this.modelValue.length : '1') : this.emptySelectionMessageText; return this.hasSelectedOption ? this.selectionMessageText.replaceAll('{0}', this.multiple ? this.modelValue.length : '1') : this.emptySelectionMessageText;
}, },
focusedOptionId() { focusedOptionId() {
return this.focusedOptionIndex !== -1 ? `${this.id}_${this.focusedOptionIndex}` : null; return this.focusedOptionIndex !== -1 ? `${this.id}_${this.focusedOptionIndex}` : null;

3
src/components/multiselect/MultiSelect.vue
View File

@ -674,6 +674,7 @@ export default {
this.unbindOutsideClickListener(); this.unbindOutsideClickListener();
this.unbindScrollListener(); this.unbindScrollListener();
this.unbindResizeListener(); this.unbindResizeListener();
this.$emit('hide'); this.$emit('hide');
this.overlay = null; this.overlay = null;
}, },
@ -1011,7 +1012,7 @@ export default {
return this.emptySelectionMessage || this.$primevue.config.locale.emptySelectionMessage; return this.emptySelectionMessage || this.$primevue.config.locale.emptySelectionMessage;
}, },
selectedMessageText() { selectedMessageText() {
return ObjectUtils.isNotEmpty(this.modelValue) ? this.selectionMessageText.replaceAll('{0}', this.modelValue.length) : this.emptySelectionMessageText; return this.hasSelectedOption ? this.selectionMessageText.replaceAll('{0}', this.modelValue.length) : this.emptySelectionMessageText;
}, },
focusedOptionId() { focusedOptionId() {
return this.focusedOptionIndex !== -1 ? `${this.id}_${this.focusedOptionIndex}` : null; return this.focusedOptionIndex !== -1 ? `${this.id}_${this.focusedOptionIndex}` : null;