From 7ac240f6f20688fc6d944c743986c389412dd1b7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 28 Nov 2016 13:49:45 +0100 Subject: [PATCH] fix dialog to window using css Signed-off-by: Robin Appelman --- core/css/jquery.ocdialog.css | 5 ++++- core/js/jquery.ocdialog.js | 11 ----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css index 7a7695a4e89..72253a6549c 100644 --- a/core/css/jquery.ocdialog.css +++ b/core/css/jquery.ocdialog.css @@ -3,7 +3,7 @@ color: #333; border-radius: 3px; box-shadow: 0 0 7px #888; padding: 15px; - z-index: 1000; + z-index: 10000; font-size: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -12,6 +12,9 @@ top: 50%; left: 50%; transform: translate(-50%, -50%); + max-height: calc(100% - 20px); + max-width: calc(100% - 20px); + overflow: auto; } .oc-dialog-title { background: #fff; diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js index 1f02a372345..449c97ca01b 100644 --- a/core/js/jquery.ocdialog.js +++ b/core/js/jquery.ocdialog.js @@ -73,19 +73,8 @@ return false; } }); - $(window).resize(function() { - self.parent = self.$dialog.parent().length > 0 ? self.$dialog.parent() : $('body'); - var pos = self.parent.position(); - self.$dialog.css({ - width: Math.min(self.options.width, $(window).innerWidth() - 20 ), - height: Math.min(self.options.height, $(window).innerHeight() - 20) - }); - // set sizes of content - self._setSizes(); - }); this._setOptions(this.options); - $(window).trigger('resize'); this._createOverlay(); }, _init: function() { -- 2.39.5