[Pkg-owncloud-commits] [owncloud] 07/123: Resize filepicker on window size change
David Prévot
taffit at moszumanska.debian.org
Tue May 19 23:55:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit e0640a0232236854e08a7b8bb57958229ae21f44
Author: Morris Jobke <hey at morrisjobke.de>
Date: Wed May 6 11:00:23 2015 +0200
Resize filepicker on window size change
* add 20 px space to each direction -> 10px padding to left, right, top and bottom
* fixes #16100
---
core/js/jquery.ocdialog.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index e48e3e8..ea034f0 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);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list