diff options
| author | Robin Appelman <robin@icewind.nl> | 2016-11-28 14:05:46 +0100 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2016-11-28 14:05:46 +0100 |
| commit | b2b9abfa33f75f779e62f8f2554e2159b3bca90d (patch) | |
| tree | 66220f0870af86cda1fd147424813d482355d5eb /core/js | |
| parent | 7ac240f6f20688fc6d944c743986c389412dd1b7 (diff) | |
| download | nextcloud-server-b2b9abfa33f75f779e62f8f2554e2159b3bca90d.tar.gz nextcloud-server-b2b9abfa33f75f779e62f8f2554e2159b3bca90d.zip | |
move more sizing logic to css
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/jquery.ocdialog.js | 23 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 4 |
2 files changed, 8 insertions, 19 deletions
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js index 449c97ca01b..b54cce2c0ca 100644 --- a/core/js/jquery.ocdialog.js +++ b/core/js/jquery.ocdialog.js @@ -159,27 +159,16 @@ $.Widget.prototype._setOptions.apply(this, arguments); }, _setSizes: function() { - var content_height = this.$dialog.height(); + var lessHeight = 0; if(this.$title) { - content_height -= this.$title.outerHeight(true); + lessHeight += this.$title.outerHeight(true); } if(this.$buttonrow) { - content_height -= this.$buttonrow.outerHeight(true); - } - this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body'); - if (this.parent.height() > 0) { - content_height = Math.min(content_height, this.parent.height() - 20); - } - if (content_height> 0) { - this.element.css({ - height: content_height + 'px', - width: this.$dialog.innerWidth() - 30 + 'px' - }); - } else { - this.element.css({ - width : this.$dialog.innerWidth() - 30 + 'px' - }); + lessHeight += this.$buttonrow.outerHeight(true); } + this.element.css({ + 'height': 'calc(100% - ' + lessHeight + 'px)' + }); }, _createOverlay: function() { if(!this.options.modal) { diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 26f06cfbb27..a9547b1adc5 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -232,8 +232,8 @@ var OCdialogs = { self.$filePicker.ocdialog({ closeOnEscape: true, // max-width of 600 - width: Math.min((4/5)*$(document).width(), 600), - height: Math.min((4 / 5) * $(document).height(), 500), + width: 600, + height: 500, modal: modal, buttons: buttonlist, close: function() { |