diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-06 12:54:32 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-06 12:54:32 +0100 |
| commit | 71169de8230812f2d05b87bfba42331e04663b81 (patch) | |
| tree | 57ac21bd303f0a44f582f0d3bb047b0fc33de004 /phpBB/assets/javascript | |
| parent | 4684ba08690b1a6e305d9f6bf8d38cacb86dc387 (diff) | |
| parent | dbe7154065fd4195395d620654ae7897e057a37e (diff) | |
| download | forums-71169de8230812f2d05b87bfba42331e04663b81.tar forums-71169de8230812f2d05b87bfba42331e04663b81.tar.gz forums-71169de8230812f2d05b87bfba42331e04663b81.tar.bz2 forums-71169de8230812f2d05b87bfba42331e04663b81.tar.xz forums-71169de8230812f2d05b87bfba42331e04663b81.zip | |
Merge remote-tracking branch 'prototech/ticket/11241' into develop
* prototech/ticket/11241:
[ticket/11241] Retain button gradient when menu is active.
[ticket/11241] Fix the disappearing dropdown when responsive changes take effect
[ticket/11241] Add border to dropdown menu options.
[ticket/11241] Add events & var for extensions to dropdown.
[ticket/11241] Fix the dropdown in RTL languages.
[ticket/11241] Use DEFINE for the block.
[ticket/11241] Consolidate topic actions into "Topic tools" dropdown.
[ticket/11241] Add dropdown control button.
Diffstat (limited to 'phpBB/assets/javascript')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 8d0db5da1a..5b8331bdce 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -932,6 +932,14 @@ phpbb.toggleDropdown = function() { }; /** +* Toggle dropdown submenu +*/ +phpbb.toggleSubmenu = function(e) { + $(this).siblings('.dropdown-submenu').toggle(); + e.preventDefault(); +} + +/** * Register dropdown menu * Shows/hides dropdown, decides which side to open to * @@ -962,6 +970,7 @@ phpbb.registerDropdown = function(toggle, dropdown, options) toggle.data('dropdown-options', ops); toggle.click(phpbb.toggleDropdown); + $('.dropdown-toggle-submenu', ops.parent).click(phpbb.toggleSubmenu); }; /** |