Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 14 insertions, 14 deletions

diff --git a/mw-config/config.js b/mw-config/config.js
index cf17aef7..fb637f79 100644
--- a/mw-config/config.js
+++ b/mw-config/config.js
@@ -3,7 +3,7 @@
 		var $label, labelText;
 
 		function syncText() {
-			var value = $(this).val()
+			var value = $( this ).val()
 				.replace( /[\[\]\{\}|#<>%+? ]/g, '_' )
 				.replace( /&/, '&amp;' )
 				.replace( /__+/g, '_' )
@@ -14,22 +14,22 @@
 		}
 
 		// Set up the help system
-		$( '.mw-help-field-data' )
+		$( '.config-help-field-data' )
 			.hide()
-			.closest( '.mw-help-field-container' )
-				.find( '.mw-help-field-hint' )
+			.closest( '.config-help-field-container' )
+				.find( '.config-help-field-hint' )
 					.show()
 					.click( function () {
-						$(this)
-							.closest( '.mw-help-field-container' )
-								.find( '.mw-help-field-data' )
+						$( this )
+							.closest( '.config-help-field-container' )
+								.find( '.config-help-field-data' )
 									.slideToggle( 'fast' );
 					} );
 
 		// Show/hide code for DB-specific options
 		// FIXME: Do we want slow, fast, or even non-animated (instantaneous) showing/hiding here?
 		$( '.dbRadio' ).each( function () {
-			$( document.getElementById( $(this).attr( 'rel' ) ) ).hide();
+			$( document.getElementById( $( this ).attr( 'rel' ) ) ).hide();
 		} );
 		$( document.getElementById( $( '.dbRadio:checked' ).attr( 'rel' ) ) ).show();
 		$( '.dbRadio' ).click( function () {
@@ -58,16 +58,16 @@
 
 		// Show/hide random stuff (email, upload)
 		$( '.showHideRadio' ).click( function () {
-			var $wrapper = $( '#' + $(this).attr( 'rel' ) );
-			if ( $(this).is( ':checked' ) ) {
+			var $wrapper = $( '#' + $( this ).attr( 'rel' ) );
+			if ( $( this ).is( ':checked' ) ) {
 				$wrapper.show( 'slow' );
 			} else {
 				$wrapper.hide( 'slow' );
 			}
 		} );
 		$( '.hideShowRadio' ).click( function () {
-			var $wrapper = $( '#' + $(this).attr( 'rel' ) );
-			if ( $(this).is( ':checked' ) ) {
+			var $wrapper = $( '#' + $( this ).attr( 'rel' ) );
+			if ( $( this ).is( ':checked' ) ) {
 				$wrapper.hide( 'slow' );
 			} else {
 				$wrapper.show( 'slow' );
@@ -80,9 +80,9 @@
 
 		// Enable/disable "other" textboxes
 		$( '.enableForOther' ).click( function () {
-			var $textbox = $( document.getElementById( $(this).attr( 'rel' ) ) );
+			var $textbox = $( document.getElementById( $( this ).attr( 'rel' ) ) );
 			// FIXME: Ugh, this is ugly
-			if ( $(this).val() === 'other' ) {
+			if ( $( this ).val() === 'other' ) {
 				$textbox.removeProp( 'readonly' ).closest( '.config-block' ).slideDown( 'fast' );
 			} else {
 				$textbox.prop( 'readonly', true ).closest( '.config-block' ).slideUp( 'fast' );