r59189 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r59188‎ | r59189 | r59190 >
Date:23:51, 17 November 2009
Author:werdna
Status:deferred
Tags:
Comment:
Merge r59188 from trunk
Modified paths:
  • /branches/wmf-deployment/extensions/LiquidThreads_alpha (modified) (history)
  • /branches/wmf-deployment/extensions/LiquidThreads_alpha/lqt.js (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/lqt.js
@@ -52,10 +52,12 @@
5353
5454 'injectEditForm' : function(query, container, preload) {
5555 var url = wgServer+wgScript+'?lqt_inline=1&title='+encodeURIComponent(wgPageName)+
56 - query
 56+ query;
5757
5858 liquidThreads.cancelEdit( container );
5959
 60+ var isIE7 = $j.browser.msie && $j.browser.version.substr(0,1) == '7';
 61+
6062 var loadSpinner = $j('<div class="mw-ajax-loader"/>');
6163 $j(container).before( loadSpinner );
6264
@@ -86,7 +88,11 @@
8789 $j("textarea", container)[0].value = preload;
8890 }
8991
90 - $j(container).slideDown( 'slow', finishShow );
 92+ if ( isIE7 ) {
 93+ setTimeout( finishShow, 500 );
 94+ } else {
 95+ $j(container).slideDown( 'slow', finishShow );
 96+ }
9197
9298 var cancelButton = $j(container).find('#mw-editform-cancel');
9399 cancelButton.click( liquidThreads.cancelEdit );
@@ -113,8 +119,16 @@
114120
115121 $j.getScript( stylepath+'/common/edit.js',
116122 function() {
117 - $j(container).load(wgServer+wgScript, 'title='+encodeURIComponent(wgPageName)+
 123+ if ( isIE7 ) {
 124+ $j(container).empty().show();
 125+ $j(container).load(wgServer+wgScript,
 126+ 'title='+encodeURIComponent(wgPageName)+
118127 query+'&lqt_inline=1', finishSetup );
 128+ } else {
 129+ $j(container).load(wgServer+wgScript,
 130+ 'title='+encodeURIComponent(wgPageName)+
 131+ query+'&lqt_inline=1', finishSetup );
 132+ }
119133 } );
120134
121135 },
Property changes on: branches/wmf-deployment/extensions/LiquidThreads_alpha
___________________________________________________________________
Name: svn:mergeinfo
122136 - /trunk/extensions/LiquidThreads:57390,58990-59180
123137 + /trunk/extensions/LiquidThreads:57390,58990-59188

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r59188LiquidThreads: For IE7, disable animation of reply window showing, fixes rema...werdna23:48, 17 November 2009

Status & tagging log