diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-02-20 20:34:26 +0400 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-02-20 20:34:26 +0400 |
| commit | 18dab4a88e82a76f3912b755ba39fc1f4889fecd (patch) | |
| tree | 00a390cb7cf0092768a1e7125428ea77fdb3da86 | |
| parent | 383194cb446adc47a9225870bda442a00e88d681 (diff) | |
| parent | 5a8e0f2048d6b2ef1d271fc8ca05c6d5bd338aed (diff) | |
Merge pull request #1738 from owncloud/fix_multiselect_in_settings
Extra position check for multiselect dropdown. Fix app/issues/575
| -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, |