[Pkg-owncloud-commits] [owncloud] 86/172: Don't set the dialog content height to a zero or negative value

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 46d6cb739d1f43482a1a512b0a86782a2ae9d8d6
Author: Robin Appelman <icewind at owncloud.com>
Date:   Tue May 13 11:37:29 2014 +0200

    Don't set the dialog content height to a zero or negative value
---
 core/js/jquery.ocdialog.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index b91f3ed..66d9b12 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -160,10 +160,16 @@
 			}
 			this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body');
 			content_height = Math.min(content_height, this.parent.height()-20);
-			this.element.css({
-				height: content_height + 'px',
-				width: this.$dialog.innerWidth()-20 + 'px'
-			});
+			if (content_height> 0) {
+				this.element.css({
+					height: content_height + 'px',
+					width: this.$dialog.innerWidth()-20 + 'px'
+				});
+			} else {
+				this.element.css({
+					width : this.$dialog.innerWidth() - 20 + 'px'
+				});
+			}
 		},
 		_createOverlay: function() {
 			if(!this.options.modal) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git