diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-06-17 16:06:47 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-06-17 16:06:47 +0200 |
| commit | 9a0b0ba4889142d1b105bcf7df2b5b79864b8013 (patch) | |
| tree | 798048dabc3256e285a075faf65dccbe93f6cb3a | |
| parent | a89bb1d3839b80f8846b0ed9e462a42065d4ad9f (diff) | |
| parent | 2abedd544beb962219493defcdcb1561be1b12d1 (diff) | |
| download | nextcloud-server-9a0b0ba4889142d1b105bcf7df2b5b79864b8013.tar.gz nextcloud-server-9a0b0ba4889142d1b105bcf7df2b5b79864b8013.zip | |
Merge pull request #16893 from owncloud/fixSlideToggle
Fix childs of slideToggle not sliding the target
| -rw-r--r-- | apps/files/templates/appnavigation.php | 2 | ||||
| -rw-r--r-- | core/js/apps.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php index 70b98303b06..512300e3a58 100644 --- a/apps/files/templates/appnavigation.php +++ b/apps/files/templates/appnavigation.php @@ -12,7 +12,7 @@ <div id="app-settings"> <div id="app-settings-header"> <button class="settings-button" data-apps-slide-toggle="#app-settings-content"> - <span><?php p($l->t('Settings'));?></span> + <?php p($l->t('Settings'));?> </button> </div> <div id="app-settings-content"> diff --git a/core/js/apps.js b/core/js/apps.js index e9aa0fdfe8d..ecefa48caa1 100644 --- a/core/js/apps.js +++ b/core/js/apps.js @@ -58,7 +58,7 @@ if (!area.is(':animated')) { // button toggles the area - if (button === event.target) { + if (button === event.target.closest('[data-apps-slide-toggle]')) { if (area.is(':visible')) { hideArea(); } else { |