diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-20 23:46:15 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-20 23:46:15 +0100 |
| commit | 3eb9cd035f42cfe208e4661f6932418ef5502842 (patch) | |
| tree | ff5e899499a12cd25fb8cc44f775fcf243d270b7 /core/js | |
| parent | c1847aaf5159200c38eb52693a2d2a84aef5cb5f (diff) | |
| parent | d2f9c3e8e721a341213c91b67b3b4ede070a59a5 (diff) | |
| download | nextcloud-server-3eb9cd035f42cfe208e4661f6932418ef5502842.tar.gz nextcloud-server-3eb9cd035f42cfe208e4661f6932418ef5502842.zip | |
Merge branch 'master' into trash_bin_delete_selected
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/multiselect.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/js/multiselect.js b/core/js/multiselect.js index 623c6e0f7e1..bc4223feb64 100644 --- 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, |