| Index: trunk/extensions/UploadWizard/resources/uploadWizard.css |
| — | — | @@ -348,8 +348,7 @@ |
| 349 | 349 | } |
| 350 | 350 | |
| 351 | 351 | .mwe-upwiz-stepdiv { |
| 352 | | - height: 0px; |
| 353 | | - overflow: hidden; |
| | 352 | + position: relative; |
| 354 | 353 | } |
| 355 | 354 | |
| 356 | 355 | |
| Index: trunk/extensions/UploadWizard/resources/mw.UploadWizard.js |
| — | — | @@ -1751,9 +1751,9 @@ |
| 1752 | 1752 | // this will break if we ever allow people to page back and forth. |
| 1753 | 1753 | } else { |
| 1754 | 1754 | if ( selectedStepName === stepName ) { |
| 1755 | | - stepDiv.maskSafeShow(); |
| | 1755 | + stepDiv.hide(); |
| 1756 | 1756 | } else { |
| 1757 | | - stepDiv.maskSafeHide( 1000 ); |
| | 1757 | + stepDiv.show( 1000 ); |
| 1758 | 1758 | } |
| 1759 | 1759 | } |
| 1760 | 1760 | |
| — | — | @@ -2396,6 +2396,7 @@ |
| 2397 | 2397 | |
| 2398 | 2398 | }; |
| 2399 | 2399 | |
| | 2400 | + // n.b. this is not called currently -- all uses of mask() are permanent |
| 2400 | 2401 | jQuery.fn.unmask = function( options ) { |
| 2401 | 2402 | |
| 2402 | 2403 | $j.each( this, function( i, el ) { |
| — | — | @@ -2412,35 +2413,6 @@ |
| 2413 | 2414 | }; |
| 2414 | 2415 | |
| 2415 | 2416 | |
| 2416 | | - /** |
| 2417 | | - * Safe hide and show |
| 2418 | | - * Rather than use display: none, this collapses the divs to zero height |
| 2419 | | - * This is good because then the elements in the divs still have layout and we can do things like mask and unmask (above) |
| 2420 | | - * XXX may be obsolete as we are not really doing this any more |
| 2421 | | - * disable form fields so we do not tab through them when hidden |
| 2422 | | - * XXX for some reason the disabling doesn't work with the date field. |
| 2423 | | - */ |
| 2424 | | - |
| 2425 | | - jQuery.fn.maskSafeHide = function( options ) { |
| 2426 | | - $j.each( this.find( ':enabled' ), function(i, input) { |
| 2427 | | - $j( input ).data( 'wasEnabled', true ) |
| 2428 | | - .attr( 'disabled', 'disabled' ); |
| 2429 | | - } ); |
| 2430 | | - return this.css( { 'height' : '0px', 'overflow' : 'hidden' } ); |
| 2431 | | - }; |
| 2432 | | - |
| 2433 | | - // may be causing scrollbar to appear when div changes size |
| 2434 | | - // re-enable form fields (disabled so we did not tab through them when hidden) |
| 2435 | | - jQuery.fn.maskSafeShow = function( options ) { |
| 2436 | | - $j.each( this.find( ':disabled' ), function (i, input) { |
| 2437 | | - if ($j( input ).data( 'wasEnabled' )) { |
| 2438 | | - $j( input ).removeAttr( 'disabled' ) |
| 2439 | | - .removeData( 'wasEnabled' ); |
| 2440 | | - } |
| 2441 | | - } ); |
| 2442 | | - return this.css( { 'height' : 'auto', 'overflow' : 'visible' } ); |
| 2443 | | - }; |
| 2444 | | - |
| 2445 | 2417 | $j.validator.setDefaults( { |
| 2446 | 2418 | debug: true, |
| 2447 | 2419 | errorClass: 'mwe-validator-error' |