Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 0 insertions, 42 deletions

diff --git a/resources/mediawiki.special/mediawiki.special.changeemail.js b/resources/mediawiki.special/mediawiki.special.changeemail.js
deleted file mode 100644
index 2d22bad0..00000000
--- a/resources/mediawiki.special/mediawiki.special.changeemail.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * JavaScript for Special:ChangeEmail
- */
-( function ( mw, $ ) {
-	/**
-	 * Given an email validity status (true, false, null) update the label CSS class
-	 */
-	function updateMailValidityLabel( mail ) {
-		var isValid = mw.util.validateEmail( mail ),
-			$label = $( '#mw-emailaddress-validity' );
-
-		// We allow empty address
-		if ( isValid === null ) {
-			$label.text( '' ).removeClass( 'valid invalid' );
-
-		// Valid
-		} else if ( isValid ) {
-			$label.text( mw.msg( 'email-address-validity-valid' ) ).addClass( 'valid' ).removeClass( 'invalid' );
-
-		// Not valid
-		} else {
-			$label.text( mw.msg( 'email-address-validity-invalid' ) ).addClass( 'invalid' ).removeClass( 'valid' );
-		}
-	}
-
-	$( function () {
-		// Lame tip to let user know if its email is valid. See bug 22449.
-		// Only bind once for 'blur' so that the user can fill it in without errors;
-		// after that, look at every keypress for immediate feedback.
-		$( '#wpNewEmail' ).one( 'blur', function () {
-			var $this = $( this );
-			if ( $( '#mw-emailaddress-validity' ).length === 0 ) {
-				$this.after( '<label for="wpNewEmail" id="mw-emailaddress-validity"></label>' );
-			}
-
-			updateMailValidityLabel( $this.val() );
-			$this.keyup( function () {
-				updateMailValidityLabel( $this.val() );
-			} );
-		} );
-	} );
-}( mediaWiki, jQuery ) );