diff options
author | Gábor Hojtsy <gabor@hojtsy.hu> | 2008-01-29 10:58:25 +0000 |
---|---|---|
committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2008-01-29 10:58:25 +0000 |
commit | becdc4321d93f081930d8916023021b3464ef250 (patch) | |
tree | 9655e0972262bc355965df1c99065156c25f2b5b /misc/collapse.js | |
parent | d04ebcee1dd811bcd51ec9cda6d97258be153af5 (diff) | |
download | brdo-becdc4321d93f081930d8916023021b3464ef250.tar.gz brdo-becdc4321d93f081930d8916023021b3464ef250.tar.bz2 |
#214292 by theborg: collapse.js alters the default submit buttons in forms in Internet Explorer
Diffstat (limited to 'misc/collapse.js')
-rw-r--r-- | misc/collapse.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/misc/collapse.js b/misc/collapse.js index 2c03d52dc..5628c4b9a 100644 --- a/misc/collapse.js +++ b/misc/collapse.js @@ -5,7 +5,9 @@ */ Drupal.toggleFieldset = function(fieldset) { if ($(fieldset).is('.collapsed')) { - var content = $('> div', fieldset); + // Action div containers are processed separately because of a IE bug + // that alters the default submit button behavior. + var content = $('> div:not(.action)', fieldset); $(fieldset).removeClass('collapsed'); content.hide(); content.slideDown( { @@ -14,6 +16,7 @@ Drupal.toggleFieldset = function(fieldset) { complete: function() { Drupal.collapseScrollIntoView(this.parentNode); this.parentNode.animating = false; + $('div.action', fieldset).show(); }, step: function() { // Scroll the fieldset into view @@ -22,7 +25,8 @@ Drupal.toggleFieldset = function(fieldset) { }); } else { - var content = $('> div', fieldset).slideUp('fast', function() { + $('div.action', fieldset).hide(); + var content = $('> div:not(.action)', fieldset).slideUp('fast', function() { $(this.parentNode).addClass('collapsed'); this.parentNode.animating = false; }); @@ -67,7 +71,7 @@ Drupal.behaviors.collapse = function (context) { return false; })) .after($('<div class="fieldset-wrapper"></div>') - .append(fieldset.children(':not(legend)'))) + .append(fieldset.children(':not(legend):not(.action)'))) .addClass('collapse-processed'); }); }; |