diff options
| author | Frederic Guillot <fred@kanboard.net> | 2016-02-11 21:05:08 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2016-02-11 21:05:08 -0500 |
| commit | d9d28adc2089c2330b6179f536018cbf864fa2b9 (patch) | |
| tree | 8241a1c6453744d9e5fdbea2f7e75d10ef932536 /assets/js/src | |
| parent | a0d8f90e57b08a73a6b0341d51662152060a78c6 (diff) | |
| parent | 47336c43c1405931eded5b6fc82e513fb3dcdceb (diff) | |
Merge pull-request #1814
Diffstat (limited to 'assets/js/src')
| -rw-r--r-- | assets/js/src/Dropdown.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/assets/js/src/Dropdown.js b/assets/js/src/Dropdown.js index 146a3c17..61738da9 100644 --- a/assets/js/src/Dropdown.js +++ b/assets/js/src/Dropdown.js @@ -26,11 +26,11 @@ Dropdown.prototype.listen = function() { var submenuHeight = clone.outerHeight(); var submenuWidth = clone.outerWidth(); - if (offset.top + submenuHeight - $(window).scrollTop() > $(window).height()) { - clone.css('top', offset.top - submenuHeight - 5); + if (offset.top + submenuHeight - $(window).scrollTop() < $(window).height() || $(window).scrollTop() + offset.top < submenuHeight) { + clone.css('top', offset.top + $(this).height()); } else { - clone.css('top', offset.top + $(this).height()); + clone.css('top', offset.top - submenuHeight - 5); } if (offset.left + submenuWidth > $(window).width()) { |