diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-02 07:58:06 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-02 07:58:06 +0200 |
| commit | e5fc7b9dbeb01ac116bb132903c562c8f7d3c5b3 (patch) | |
| tree | b7d8d913cdf7f4d1ce42f3027918ad0f5fbe5c3b /core/js/jquery.ocdialog.js | |
| parent | 8dd93c8c0288a11f04816bea2a58aee661ef9e97 (diff) | |
| parent | f038cb9aea7c9a1513ab14d0df002773b17d5333 (diff) | |
| download | nextcloud-server-e5fc7b9dbeb01ac116bb132903c562c8f7d3c5b3.tar.gz nextcloud-server-e5fc7b9dbeb01ac116bb132903c562c8f7d3c5b3.zip | |
Merge branch 'master' into clean_up_util
Conflicts:
lib/base.php
Diffstat (limited to 'core/js/jquery.ocdialog.js')
| -rw-r--r-- | core/js/jquery.ocdialog.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js index 7413927e3b2..bafbd0e0e9f 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'); @@ -152,7 +152,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' @@ -187,7 +187,7 @@ } }, widget: function() { - return this.$dialog + return this.$dialog; }, close: function() { this._destroyOverlay(); @@ -200,10 +200,10 @@ }, destroy: function() { if(this.$title) { - this.$title.remove() + this.$title.remove(); } if(this.$buttonrow) { - this.$buttonrow.remove() + this.$buttonrow.remove(); } if(this.originalTitle) { |