From b8e85710a955aed014bbe22c71906320609973e2 Mon Sep 17 00:00:00 2001 From: euvl Date: Fri, 10 Mar 2017 16:25:29 +0000 Subject: [PATCH] Added resizing borders --- Modal/Modal.vue | 10 +++++----- Modal/Resizer.vue | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Modal/Modal.vue b/Modal/Modal.vue index f6ab9bf..3b64a1a 100644 --- a/Modal/Modal.vue +++ b/Modal/Modal.vue @@ -143,13 +143,12 @@ this.window.height = window.innerHeight; if (this.adaptive) { - var width = this.window.width > this.width - ? this.width + var width = this.window.width > this.modal.width + ? this.modal.width : this.window.width - /*this.modal.height*/ - var height = this.window.height > this.height - ? this.height + var height = this.window.height > this.modal.height + ? this.modal.height : this.window.height; this.modal.width = width;//Math.max(width, this.minWidth); @@ -167,6 +166,7 @@ }, resize(event) { this.modal.width = event.size.width; + this.modal.height = event.size.height; let resizeEvent = this.genEventObject({ size: this.modal diff --git a/Modal/Resizer.vue b/Modal/Resizer.vue index dba3f93..3b6a167 100644 --- a/Modal/Resizer.vue +++ b/Modal/Resizer.vue @@ -24,11 +24,14 @@ export default { this.$el.addEventListener('mousedown', this.start, false); }, methods: { - start() { + start(event) { this.clicked = true; window.addEventListener('mousemove', this.mousemove, false); window.addEventListener('mouseup', this.stop, false); + + event.stopPropagation(); + event.preventDefault(); }, stop() { this.clicked = false; @@ -51,12 +54,21 @@ export default { var width = event.clientX - el.offsetLeft; var height = event.clientY - el.offsetTop; + + if (width < this.minWidth) { + width = this.minWidth; + } + + if (width > window.innerWidth) { + width = window.innerWidth; + } + if (height < this.minHeight) { height = this.minHeight; } - if (width < this.minWidth) { - width = this.minWidth; + if (height > window.innerHeight) { + height = window.innerHeight; } this.size = {width, height};