From 7dd1b797c0313c7e3d79f5359dd840e8c5d4e1a7 Mon Sep 17 00:00:00 2001 From: Krinkle Date: Tue, 14 Dec 2010 17:21:40 +0000 Subject: [PATCH] * Removing wfSupportsAjax() call. We don't use legacy sajax_ anymore, jQuery takes care of this * Thus also removing the dependency on mediawiki.legacy.ajax in mediawiki.action.watch.ajax * Moving the show() call further down in jsMessage. Before this commit the box shows for a split second (empty) and then it suddenly grows with content. Now moved it down so that it comes into view, filled already. Also made it possible to bring back the slideDown effect without ugly flashes. --- resources/Resources.php | 2 +- resources/mediawiki.action/mediawiki.action.watch.ajax.js | 2 +- resources/mediawiki.util/mediawiki.util.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/Resources.php b/resources/Resources.php index 96489042ea..0ead557157 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -342,7 +342,7 @@ return array( ), 'mediawiki.action.watch.ajax' => array( 'scripts' => 'resources/mediawiki.action/mediawiki.action.watch.ajax.js', - 'dependencies' => array( 'mediawiki.util', 'mediawiki.legacy.ajax' ), + 'dependencies' => array( 'mediawiki.util' ), ), 'mediawiki.special.preferences' => array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js', diff --git a/resources/mediawiki.action/mediawiki.action.watch.ajax.js b/resources/mediawiki.action/mediawiki.action.watch.ajax.js index 72ff5e3d30..7994cfc465 100644 --- a/resources/mediawiki.action/mediawiki.action.watch.ajax.js +++ b/resources/mediawiki.action/mediawiki.action.watch.ajax.js @@ -73,7 +73,7 @@ $( document ).ready( function() { $links.click( function( event ) { var $link = $( this ); - if( wgAjaxWatch.supported === false || !mw.config.get( 'wgEnableWriteAPI' ) || !wfSupportsAjax() ) { + if( wgAjaxWatch.supported === false || !mw.config.get( 'wgEnableWriteAPI' ) ) { // Lazy initialization so we don't toss up // ActiveX warnings on initial page load // for IE 6 users with security settings. diff --git a/resources/mediawiki.util/mediawiki.util.js b/resources/mediawiki.util/mediawiki.util.js index bc17158ba4..0f9c4c6039 100644 --- a/resources/mediawiki.util/mediawiki.util.js +++ b/resources/mediawiki.util/mediawiki.util.js @@ -346,7 +346,6 @@ } } - $messageDiv.show(); if ( className ) { $messageDiv.attr( 'class', 'mw-js-message-' + className ); } @@ -357,6 +356,8 @@ } else { $messageDiv.html( message ); } + + $messageDiv.slideDown(); return true; } } -- 2.20.1