Skip to content

Commit

Permalink
Merge area17#670: Fix Multi select field doesn't prevent user from pi…
Browse files Browse the repository at this point in the history
…cking duplicated option

Update distributed assets
  • Loading branch information
MamlukiSn authored and ifox committed Jul 20, 2020
1 parent 8946915 commit 33e54a4
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 6 deletions.

Large diffs are not rendered by default.

File renamed without changes.
10 changes: 5 additions & 5 deletions dist/assets/admin/twill-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@
"Inter-Regular.woff": "/assets/admin/fonts/Inter-Regular.aebfbb3c.woff",
"Inter-Regular.woff2": "/assets/admin/fonts/Inter-Regular.bffaed79.woff2",
"chunk-common.css": "/assets/admin/css/chunk-common.f96d24c0.css",
"chunk-common.js": "/assets/admin/js/chunk-common.81774312.js",
"chunk-common.js": "/assets/admin/js/chunk-common.b6c4ec97.js",
"chunk-vendors.css": "/assets/admin/css/chunk-vendors.e0f3ef32.css",
"chunk-vendors.js": "/assets/admin/js/chunk-vendors.aa8e5164.js",
"icons-files.svg": "/assets/admin/icons/icons-files.3cdbddfb2725088d.svg",
"icons-wysiwyg.svg": "/assets/admin/icons/icons-wysiwyg.63f0e2d625dc615e.svg",
"icons.svg": "/assets/admin/icons/icons.2ee8758aafe79e18.svg",
"main-buckets.css": "/assets/admin/css/main-buckets.b3760912.css",
"main-buckets.js": "/assets/admin/js/main-buckets.3d6452dd.js",
"main-buckets.js": "/assets/admin/js/main-buckets.35c291fc.js",
"main-dashboard.css": "/assets/admin/css/main-dashboard.27f5455a.css",
"main-dashboard.js": "/assets/admin/js/main-dashboard.19416c7e.js",
"main-dashboard.js": "/assets/admin/js/main-dashboard.aaca0931.js",
"main-form.css": "/assets/admin/css/main-form.96525dd9.css",
"main-form.js": "/assets/admin/js/main-form.60c04e5c.js",
"main-form.js": "/assets/admin/js/main-form.39aa8e28.js",
"main-free.js": "/assets/admin/js/main-free.6761fc8a.js",
"main-listing.css": "/assets/admin/css/main-listing.77e7845a.css",
"main-listing.js": "/assets/admin/js/main-listing.b1f6f49e.js"
"main-listing.js": "/assets/admin/js/main-listing.f521581b.js"
}
14 changes: 14 additions & 0 deletions frontend/js/components/VSelect/ExtendedVSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,20 @@
// eslint-disable-next-line no-return-assign
return this.multiple ? this.mutableValue.pop() : this.mutableValue = null
}
},
/**
* Check if the given option is currently selected.
* @param {Object|String} option
* @return {Boolean} True when selected | False otherwise
* https://github.com/sagalbot/vue-select/commit/8a601c0ac3311adb89bc6e31b8cf215b1343d93c
*/
isOptionSelected (option) {
return this.valueAsArray.some(value => {
if (typeof value === 'object') {
return this.optionObjectComparator(value, option)
}
return value === option || value === option[this.index]
})
}
},
mounted () {
Expand Down

0 comments on commit 33e54a4

Please sign in to comment.