Merge pull request #16893 from owncloud/fixSlideToggle

Fix childs of slideToggle not sliding the target
This commit is contained in:
Morris Jobke 2015-06-17 16:06:47 +02:00
commit 9a0b0ba488
2 changed files with 2 additions and 2 deletions

View File

@ -12,7 +12,7 @@
<div id="app-settings"> <div id="app-settings">
<div id="app-settings-header"> <div id="app-settings-header">
<button class="settings-button" data-apps-slide-toggle="#app-settings-content"> <button class="settings-button" data-apps-slide-toggle="#app-settings-content">
<span><?php p($l->t('Settings'));?></span> <?php p($l->t('Settings'));?>
</button> </button>
</div> </div>
<div id="app-settings-content"> <div id="app-settings-content">

View File

@ -58,7 +58,7 @@
if (!area.is(':animated')) { if (!area.is(':animated')) {
// button toggles the area // button toggles the area
if (button === event.target) { if (button === event.target.closest('[data-apps-slide-toggle]')) {
if (area.is(':visible')) { if (area.is(':visible')) {
hideArea(); hideArea();
} else { } else {