summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/js/jquery.ocdialog.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index e48e3e8df6a..ea034f0aff7 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -78,8 +78,12 @@
var pos = self.parent.position();
self.$dialog.css({
left: pos.left + ($(window).innerWidth() - self.$dialog.outerWidth())/2,
- top: pos.top + ($(window).innerHeight() - self.$dialog.outerHeight())/2
+ top: pos.top + ($(window).innerHeight() - self.$dialog.outerHeight())/2,
+ 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);