From 8160f3170d5d6a31ed3c6ef68dd368d27dca6a63 Mon Sep 17 00:00:00 2001 From: janschoenherr Date: Tue, 11 Sep 2018 11:48:58 +0200 Subject: [PATCH] Rename selModal to selContainer adn selPanel to selContent in Overflow Auto component --- CHANGELOG.md | 4 ++++ src/js/core/overflow-auto.js | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea2c653d5b..be8ef69398 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## WIP +### Changed + +- Rename selModal to selContainer adn selPanel to selContent in Overflow Auto component + ### Fixed - Fix `isInView` function for elements with zero width and height diff --git a/src/js/core/overflow-auto.js b/src/js/core/overflow-auto.js index 472678c872..9e3c0cb0b8 100644 --- a/src/js/core/overflow-auto.js +++ b/src/js/core/overflow-auto.js @@ -6,23 +6,23 @@ export default { mixins: [Class], props: { - selModal: String, - selPanel: String, + selContainer: String, + selContent: String, }, data: { - selModal: '.uk-modal', - selPanel: '.uk-modal-dialog', + selContainer: '.uk-container', + selContent: '.uk-modal-dialog', }, computed: { - modal({selModal}, $el) { - return closest($el, selModal); + container({selContainer}, $el) { + return closest($el, selContainer); }, - panel({selPanel}, $el) { - return closest($el, selPanel); + content({selContent}, $el) { + return closest($el, selContent); } }, @@ -35,13 +35,13 @@ export default { read() { - if (!this.panel || !this.modal) { + if (!this.content || !this.container) { return false; } return { current: toFloat(css(this.$el, 'maxHeight')), - max: Math.max(150, height(this.modal) - (offset(this.panel).height - height(this.$el))) + max: Math.max(150, height(this.container) - (offset(this.content).height - height(this.$el))) }; },