Merge pull request #1738 from owncloud/fix_multiselect_in_settings

Extra position check for multiselect dropdown. Fix app/issues/575
12 years ago · 18dab4a88e
parent 383194cb44 5a8e0f2048
commit 18dab4a88e
1 changed files with 3 additions and 2 deletions
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@ -266,8 +266,9 @@
 			}
 			list.append(list.find('li.creator'));
 			var pos=button.position();
-			if($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height())
-				|| $(document).height()/2 > pos.top
+			if(($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height())
+				&& $(document).height() - button.offset().top > (button.offset().top+button.outerHeight() + list.children().length * button.height()))
+				|| $(document).height()/2 > button.offset().top
 			) {
 				list.css({
 					top:pos.top+button.outerHeight()-5,