| Index: branches/wmf-deployment/extensions/LiquidThreads/lqt.js |
| — | — | @@ -52,10 +52,12 @@ |
| 53 | 53 | |
| 54 | 54 | 'injectEditForm' : function(query, container, preload) { |
| 55 | 55 | var url = wgServer+wgScript+'?lqt_inline=1&title='+encodeURIComponent(wgPageName)+ |
| 56 | | - query |
| | 56 | + query; |
| 57 | 57 | |
| 58 | 58 | liquidThreads.cancelEdit( container ); |
| 59 | 59 | |
| | 60 | + var isIE7 = $j.browser.msie && $j.browser.version.substr(0,1) == '7'; |
| | 61 | + |
| 60 | 62 | var loadSpinner = $j('<div class="mw-ajax-loader"/>'); |
| 61 | 63 | $j(container).before( loadSpinner ); |
| 62 | 64 | |
| — | — | @@ -86,7 +88,11 @@ |
| 87 | 89 | $j("textarea", container)[0].value = preload; |
| 88 | 90 | } |
| 89 | 91 | |
| 90 | | - $j(container).slideDown( 'slow', finishShow ); |
| | 92 | + if ( isIE7 ) { |
| | 93 | + setTimeout( finishShow, 500 ); |
| | 94 | + } else { |
| | 95 | + $j(container).slideDown( 'slow', finishShow ); |
| | 96 | + } |
| 91 | 97 | |
| 92 | 98 | var cancelButton = $j(container).find('#mw-editform-cancel'); |
| 93 | 99 | cancelButton.click( liquidThreads.cancelEdit ); |
| — | — | @@ -102,8 +108,6 @@ |
| 103 | 109 | currentFocused = this; |
| 104 | 110 | } ); |
| 105 | 111 | |
| 106 | | - document.editform = $j(container).find('#editform'); |
| 107 | | - |
| 108 | 112 | // Check for live preview |
| 109 | 113 | if ( $j('#wpLivePreview').length ) { |
| 110 | 114 | $j.getScript( stylepath+'/common/preview.js', |
| — | — | @@ -118,8 +122,16 @@ |
| 119 | 123 | |
| 120 | 124 | $j.getScript( stylepath+'/common/edit.js', |
| 121 | 125 | function() { |
| 122 | | - $j(container).load(wgServer+wgScript, 'title='+encodeURIComponent(wgPageName)+ |
| | 126 | + if ( isIE7 ) { |
| | 127 | + $j(container).empty().show(); |
| | 128 | + $j(container).load(wgServer+wgScript, |
| | 129 | + 'title='+encodeURIComponent(wgPageName)+ |
| 123 | 130 | query+'&lqt_inline=1', finishSetup ); |
| | 131 | + } else { |
| | 132 | + $j(container).load(wgServer+wgScript, |
| | 133 | + 'title='+encodeURIComponent(wgPageName)+ |
| | 134 | + query+'&lqt_inline=1', finishSetup ); |
| | 135 | + } |
| 124 | 136 | } ); |
| 125 | 137 | |
| 126 | 138 | }, |
| Property changes on: branches/wmf-deployment/extensions/LiquidThreads |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 127 | 139 | - /branches/REL1_15/phase3/extensions/LiquidThreads:51646 |
| /branches/wmf-deployment/extensions/LiquidThreads_alpha:58990-59125 |
| /trunk/extensions/LiquidThreads:56151-59134 |
| /trunk/phase3/extensions/LiquidThreads:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,58633,58816 |
| 128 | 140 | + /branches/REL1_15/phase3/extensions/LiquidThreads:51646 |
| /branches/wmf-deployment/extensions/LiquidThreads_alpha:58990-59125,59188-59189 |
| /trunk/extensions/LiquidThreads:56151-59134,59169,59181-59188 |
| /trunk/phase3/extensions/LiquidThreads:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,58633,58816 |