| Index: trunk/extensions/SemanticForms/includes/SF_FormPrinter.php |
| — | — | @@ -253,7 +253,7 @@ |
| 254 | 254 | * only a page formula exists). |
| 255 | 255 | */ |
| 256 | 256 | function formHTML( $form_def, $form_submitted, $source_is_page, $form_id = null, $existing_page_content = null, $page_name = null, $page_name_formula = null, $is_query = false, $embedded = false ) { |
| 257 | | - global $wgRequest, $wgUser, $wgParser; |
| | 257 | + global $wgRequest, $wgUser; |
| 258 | 258 | global $sfgTabIndex; // used to represent the current tab index in the form |
| 259 | 259 | global $sfgFieldNum; // used for setting various HTML IDs |
| 260 | 260 | |
| Index: trunk/extensions/SemanticForms/libs/SF_popupform.js |
| — | — | @@ -603,8 +603,11 @@ |
| 604 | 604 | |
| 605 | 605 | if ( frameW != oldFrameW || frameH != oldFrameH ) { |
| 606 | 606 | |
| 607 | | - iframe[0].style.overflow="hidden"; |
| 608 | | - html[0].style.overflow="hidden"; |
| | 607 | + if ( jQuery.browser.safari ) { |
| | 608 | + html[0].style.overflow="hidden"; |
| | 609 | + } else { |
| | 610 | + iframe[0].style.overflow="hidden"; |
| | 611 | + } |
| 609 | 612 | |
| 610 | 613 | if ( animate ) { |
| 611 | 614 | |
| — | — | @@ -621,12 +624,12 @@ |
| 622 | 625 | duration: 500, |
| 623 | 626 | complete: function() { |
| 624 | 627 | |
| 625 | | - if ( jQuery.browser.msie ) { |
| | 628 | + if ( jQuery.browser.safari ) { |
| | 629 | + html[0].style.overflow="visible"; |
| | 630 | + } else if ( jQuery.browser.msie ) { |
| 626 | 631 | iframe[0].style.overflow="auto"; |
| 627 | | - html[0].style.overflow="auto"; |
| 628 | 632 | } else { |
| 629 | 633 | iframe[0].style.overflow="visible"; |
| 630 | | - html[0].style.overflow="visible"; |
| 631 | 634 | } |
| 632 | 635 | |
| 633 | 636 | if ( jQuery.browser.mozilla ) { |
| — | — | @@ -653,13 +656,15 @@ |
| 654 | 657 | } |
| 655 | 658 | |
| 656 | 659 | setTimeout(function(){ |
| 657 | | - if ( jQuery.browser.msie ) { |
| 658 | | - iframe[0].style.overflow="auto"; |
| 659 | | - html[0].style.overflow="auto"; |
| 660 | | - } else { |
| 661 | | - iframe[0].style.overflow="visible"; |
| 662 | | - html[0].style.overflow="visible"; |
| 663 | | - } |
| | 660 | + |
| | 661 | + if ( jQuery.browser.safari ) { |
| | 662 | + html[0].style.overflow="visible"; |
| | 663 | + } else if ( jQuery.browser.msie ) { |
| | 664 | + iframe[0].style.overflow="auto"; |
| | 665 | + } else { |
| | 666 | + iframe[0].style.overflow="visible"; |
| | 667 | + } |
| | 668 | + |
| 664 | 669 | }, 100); |
| 665 | 670 | |
| 666 | 671 | if ( jQuery.browser.mozilla ) { |
| — | — | @@ -681,9 +686,9 @@ |
| 682 | 687 | if ( jQuery.browser.safari ) { // Google chrome needs a kick |
| 683 | 688 | |
| 684 | 689 | // turn scrollbars off and on again to really only show them when needed |
| 685 | | - html[0].style.overflow="hidden"; |
| | 690 | + html[0].style.overflow="hidden"; |
| 686 | 691 | |
| 687 | | - setTimeout(function(){ |
| | 692 | + setTimeout(function(){ |
| 688 | 693 | html[0].style.overflow="visible"; |
| 689 | 694 | }, 1); |
| 690 | 695 | } |