diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-04 13:55:49 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-04 14:11:40 +0200 |
| commit | 4af5a8c483278eae2e8e38f5ea0a238072848b87 (patch) | |
| tree | beca3f5250e1a50eca58fa63eea056b69ab82e44 /core/js/jquery.ocdialog.js | |
| parent | 7c9d9992432839f2265b8f6b0f43ed15bfca9ff1 (diff) | |
| parent | 09187f3b3b30e6f810c6afff7332615ed472154e (diff) | |
| download | nextcloud-server-4af5a8c483278eae2e8e38f5ea0a238072848b87.tar.gz nextcloud-server-4af5a8c483278eae2e8e38f5ea0a238072848b87.zip | |
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/ajax/upload.php
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/templates/part.list.php
Diffstat (limited to 'core/js/jquery.ocdialog.js')
| -rw-r--r-- | core/js/jquery.ocdialog.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js index ce991052271..0266599d21d 100644 --- a/core/js/jquery.ocdialog.js +++ b/core/js/jquery.ocdialog.js @@ -13,7 +13,7 @@ this.originalCss = { display: this.element[0].style.display, width: this.element[0].style.width, - height: this.element[0].style.height, + height: this.element[0].style.height }; this.originalTitle = this.element.attr('title'); @@ -158,7 +158,7 @@ content_height -= this.$buttonrow.outerHeight(true); } this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body'); - content_height = Math.min(content_height, this.parent.height()-20) + content_height = Math.min(content_height, this.parent.height()-20); this.element.css({ height: content_height + 'px', width: this.$dialog.innerWidth()-20 + 'px' |