diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-04 13:32:10 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-04 13:32:10 +0200 |
commit | 4558262e2aaf31b4583a87622e97a46ead11537c (patch) | |
tree | 88a589e5f9b3b45139c32718c1caf12a5e3b1374 /phpBB/assets/javascript/core.js | |
parent | 4b49b3dcf3bc369eaced5790b95914254ab7d932 (diff) | |
parent | 86e21a9b261d6239487c626b7e9c9f462ceab611 (diff) | |
download | forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar.gz forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar.bz2 forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar.xz forums-4558262e2aaf31b4583a87622e97a46ead11537c.zip |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12013] Fix functional tests and sniffer issue.
[ticket/12013] Clear the jumpbox.
[ticket/12013] Add moderator tools icon.
[ticket/12013] Remove obsolete jumpbox and quickmod CSS.
[ticket/12013] Prevent the dropdown scrollbar from overlapping the content.
[ticket/12013] Update to use the new .button class.
[ticket/12013] Add missing class to place the buttons on the rightside.
[ticket/12013] Use the correct variable for the forum id.
[ticket/12013] Use DEFINE instead of Twig's set.
[ticket/12013] Use path helper.
[ticket/12013] Use new dropdown for quickmod tools and jumpbox.
Diffstat (limited to 'phpBB/assets/javascript/core.js')
-rw-r--r-- | phpBB/assets/javascript/core.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 02fb3ed08d..2c35875dca 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -1296,6 +1296,10 @@ phpbb.toggleDropdown = function() { else if ((offset + width + 2) > windowWidth) { $this.css('margin-left', (windowWidth - offset - width - 2) + 'px'); } + + // Check whether the vertical scrollbar is present. + $this.toggleClass('dropdown-nonscroll', this.scrollHeight === $this.innerHeight()); + }); var freeSpace = parent.offset().left - 4; |