From: Alex Monk <krenair@wikimedia.org>
Date: Wed, 27 Aug 2014 14:52:49 +0000 (+0100)
Subject: Clean up mediawiki.legacy.upload a bit more
X-Git-Tag: 1.31.0-rc.0~14217^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22statistiques_visites%22%2C%22%22%29%20.%20%22?a=commitdiff_plain;h=db9d1bd39b50cd40df9cc5b156551bf76610ce9f;p=lhc%2Fweb%2Fwiklou.git

Clean up mediawiki.legacy.upload a bit more

We can merge it into mediawiki.special.upload later.

It still sets wgUploadWarningObj, because that's used in a bunch of places:
commonswiki         MediaWiki:UploadForm.js
commonswiki         MediaWiki:UploadFormTest.js
fawiki              MediaWiki:UploadForm.js
siwiki              MediaWiki:UploadForm.js
commonswiki         User:CuteHappyBrute/monobook.js
kowiki              User:Kwj2772/UploadForm.js
sqwiki              User:Euriditi/UploadForm.js

Bug: 31946
Change-Id: I4fc3dcd1f1bfb15aa130845e3de0474943b7e3fc
---

diff --git a/skins/common/upload.js b/skins/common/upload.js
index 7933cafb70..144bdf992d 100644
--- a/skins/common/upload.js
+++ b/skins/common/upload.js
@@ -1,355 +1,246 @@
 /*jshint camelcase:false */
 ( function ( mw, $ ) {
-var	licenseSelectorCheck, wgUploadWarningObj, wgUploadLicenseObj, fillDestFilename,
-	ajaxUploadDestCheck = mw.config.get( 'wgAjaxUploadDestCheck' ),
-	fileExtensions = mw.config.get( 'wgFileExtensions' ),
-	$spinnerDestCheck, $spinnerLicense;
-
-licenseSelectorCheck = window.licenseSelectorCheck = function () {
-	var selector = document.getElementById( 'wpLicense' ),
-		selection = selector.options[selector.selectedIndex].value;
-	if ( selector.selectedIndex > 0 ) {
-		if ( !selection ) {
-			// Option disabled, but browser is broken and doesn't respect this
-			selector.selectedIndex = 0;
-		}
-	}
-	// We might show a preview
-	wgUploadLicenseObj.fetchPreview( selection );
-};
-
-function uploadSetup() {
-	// Disable URL box if the URL copy upload source type is not selected
-	var ein,
-		selector, ua, isMacIe, i,
-		optionsTable, row, td,
-		wpLicense, wpLicenseRow, wpLicenseTbody,
-		uploadSourceIds, len, onchange,
-		e = document.getElementById( 'wpSourceTypeurl' );
-	if ( e ) {
-		if ( !e.checked ) {
-			ein = document.getElementById( 'wpUploadFileURL' );
-			if ( ein ) {
-				ein.disabled = true;
-			}
-		}
-	}
-
-	// For MSIE/Mac: non-breaking spaces cause the <option> not to render.
-	// But for some reason, setting the text to itself works
-	selector = document.getElementById( 'wpLicense' );
-	if ( selector ) {
-		ua = navigator.userAgent;
-		isMacIe = ua.indexOf( 'MSIE' ) !== -1 && ua.indexOf( 'Mac' ) !== -1;
-		if ( isMacIe ) {
-			for ( i = 0; i < selector.options.length; i++ ) {
-				selector.options[i].text = selector.options[i].text;
+	var ajaxUploadDestCheck = mw.config.get( 'wgAjaxUploadDestCheck' ),
+		$license = $( '#wpLicense' ), uploadWarning, uploadLicense;
+
+	window.wgUploadWarningObj = uploadWarning = {
+		responseCache: { '': '&nbsp;' },
+		nameToCheck: '',
+		typing: false,
+		delay: 500, // ms
+		timeoutID: false,
+
+		keypress: function () {
+			if ( !ajaxUploadDestCheck ) {
+				return;
 			}
-		}
-	}
-
-	// AJAX wpDestFile warnings
-	if ( ajaxUploadDestCheck ) {
-		// Insert an event handler that fetches upload warnings when wpDestFile
-		// has been changed
-		document.getElementById( 'wpDestFile' ).onchange = function () {
-			wgUploadWarningObj.checkNow( this.value );
-		};
-		// Insert a row where the warnings will be displayed just below the
-		// wpDestFile row
-		optionsTable = document.getElementById( 'mw-htmlform-description' ).tBodies[0];
-		row = optionsTable.insertRow( 1 );
-		td = document.createElement( 'td' );
-		td.id = 'wpDestFile-warning';
-		td.colSpan = 2;
-
-		row.appendChild( td );
-	}
-
-	wpLicense = document.getElementById( 'wpLicense' );
-	if ( mw.config.get( 'wgAjaxLicensePreview' ) && wpLicense ) {
-		// License selector check
-		wpLicense.onchange = licenseSelectorCheck;
-
-		// License selector table row
-		wpLicenseRow = wpLicense.parentNode.parentNode;
-		wpLicenseTbody = wpLicenseRow.parentNode;
-
-		row = document.createElement( 'tr' );
-		td = document.createElement( 'td' );
-		row.appendChild( td );
-		td = document.createElement( 'td' );
-		td.id = 'mw-license-preview';
-		row.appendChild( td );
-
-		wpLicenseTbody.insertBefore( row, wpLicenseRow.nextSibling );
-	}
-
-	// fillDestFile setup
-	uploadSourceIds = mw.config.get( 'wgUploadSourceIds' );
-	len = uploadSourceIds.length;
-	onchange = function () {
-		fillDestFilename( this.id );
-	};
-	for ( i = 0; i < len; i += 1 ) {
-		document.getElementById( uploadSourceIds[i] ).onchange = onchange;
-	}
-}
-
-wgUploadWarningObj = window.wgUploadWarningObj = {
-	responseCache: { '': '&nbsp;' },
-	nameToCheck: '',
-	typing: false,
-	delay: 500, // ms
-	timeoutID: false,
-
-	keypress: function () {
-		var cached, destFile, warningElt;
 
-		if ( !ajaxUploadDestCheck ) {
-			return;
-		}
-
-		// Find file to upload
-		destFile = document.getElementById( 'wpDestFile' );
-		warningElt = document.getElementById( 'wpDestFile-warning' );
-		if ( !destFile || !warningElt ) {
-			return;
-		}
-
-		this.nameToCheck = destFile.value;
-
-		// Clear timer
-		if ( this.timeoutID ) {
-			clearTimeout( this.timeoutID );
-		}
-		// Check response cache
-		for ( cached in this.responseCache ) {
-			if ( this.nameToCheck === cached ) {
-				this.setWarning(this.responseCache[this.nameToCheck]);
+			// Find file to upload
+			if ( !$( '#wpDestFile' ).length || !$( '#wpDestFile-warning' ).length ) {
 				return;
 			}
-		}
 
-		this.timeoutID = setTimeout( function () {
-			wgUploadWarningObj.timeout();
-		}, this.delay );
-	},
+			this.nameToCheck = $( '#wpDestFile' ).val();
 
-	checkNow: function ( fname ) {
-		if ( !ajaxUploadDestCheck ) {
-			return;
-		}
-		if ( this.timeoutID ) {
-			clearTimeout( this.timeoutID );
-		}
-		this.nameToCheck = fname;
-		this.timeout();
-	},
-
-	timeout: function () {
-		if ( !ajaxUploadDestCheck || this.nameToCheck === '' ) {
-			return;
-		}
-		$spinnerDestCheck = $.createSpinner().insertAfter( '#wpDestFile' );
-
-		var uploadWarningObj = this;
-		( new mw.Api() ).get( {
-			action: 'query',
-			titles: ( new mw.Title( this.nameToCheck, mw.config.get( 'wgNamespaceIds' ).file ) ).getPrefixedText(),
-			prop: 'imageinfo',
-			iiprop: 'uploadwarning',
-			indexpageids: ''
-		} ).done( function ( result ) {
-			var resultOut = '';
-			if ( result.query ) {
-				resultOut = result.query.pages[result.query.pageids[0]].imageinfo[0];
+			// Clear timer
+			if ( this.timeoutID ) {
+				clearTimeout( this.timeoutID );
+			}
+			// Check response cache
+			if ( this.responseCache.hasOwnProperty( this.nameToCheck ) ) {
+				this.setWarning( this.responseCache[this.nameToCheck] );
+				return;
 			}
-			uploadWarningObj.processResult( resultOut, uploadWarningObj.nameToCheck );
-		} );
-	},
-
-	processResult: function ( result, fileName ) {
-		$spinnerDestCheck.remove();
-		$spinnerDestCheck = undefined;
-		this.setWarning( result.html );
-		this.responseCache[fileName] = result.html;
-	},
-
-	setWarning: function ( warning ) {
-		var warningElt = document.getElementById( 'wpDestFile-warning' ),
-			ackElt = document.getElementsByName( 'wpDestFileWarningAck' );
-
-		this.setInnerHTML( warningElt, warning );
-
-		// Set a value in the form indicating that the warning is acknowledged and
-		// doesn't need to be redisplayed post-upload
-		if ( !warning ) {
-			ackElt[0].value = '';
-		} else {
-			ackElt[0].value = '1';
-		}
-
-	},
-	setInnerHTML: function ( element, text ) {
-		// Check for no change to avoid flicker in IE 7
-		if ( element.innerHTML !== text ) {
-			element.innerHTML = text;
-		}
-	}
-};
-
-fillDestFilename = window.fillDestFilename = function ( id ) {
-	var e, path, slash, backslash, fname,
-		found, ext, i,
-		destFile;
-	if ( !mw.config.get( 'wgUploadAutoFill' ) ) {
-		return;
-	}
-	if ( !document.getElementById ) {
-		return;
-	}
-	// Remove any previously flagged errors
-	e = document.getElementById( 'mw-upload-permitted' );
-	if ( e ) {
-		e.className = '';
-	}
-
-	e = document.getElementById( 'mw-upload-prohibited' );
-	if ( e ) {
-		e.className = '';
-	}
 
-	path = document.getElementById( id ).value;
-	// Find trailing part
-	slash = path.lastIndexOf( '/' );
-	backslash = path.lastIndexOf( '\\' );
-	if ( slash === -1 && backslash === -1 ) {
-		fname = path;
-	} else if ( slash > backslash ) {
-		fname = path.substring( slash + 1, 10000 );
-	} else {
-		fname = path.substring( backslash + 1, 10000 );
-	}
+			this.timeoutID = setTimeout( function () {
+				uploadWarning.timeout();
+			}, this.delay );
+		},
 
-	// Clear the filename if it does not have a valid extension.
-	// URLs are less likely to have a useful extension, so don't include them in the
-	// extension check.
-	if ( mw.config.get( 'wgStrictFileExtensions' ) && fileExtensions && id !== 'wpUploadFileURL' ) {
-		found = false;
-		if ( fname.lastIndexOf( '.' ) !== -1 ) {
-			ext = fname.substr( fname.lastIndexOf( '.' ) + 1 );
-			for ( i = 0; i < fileExtensions.length; i += 1 ) {
-				if ( fileExtensions[i].toLowerCase() === ext.toLowerCase() ) {
-					found = true;
-					break;
-				}
+		checkNow: function ( fname ) {
+			if ( !ajaxUploadDestCheck ) {
+				return;
 			}
-		}
-		if ( !found ) {
-			// Not a valid extension
-			// Clear the upload and set mw-upload-permitted to error
-			document.getElementById( id ).value = '';
-			e = document.getElementById( 'mw-upload-permitted' );
-			if ( e ) {
-				e.className = 'error';
+			if ( this.timeoutID ) {
+				clearTimeout( this.timeoutID );
 			}
+			this.nameToCheck = fname;
+			this.timeout();
+		},
 
-			e = document.getElementById( 'mw-upload-prohibited' );
-			if ( e ) {
-				e.className = 'error';
+		timeout: function () {
+			var $spinnerDestCheck;
+			if ( !ajaxUploadDestCheck || this.nameToCheck === '' ) {
+				return;
 			}
-
-			// Clear wpDestFile as well
-			e = document.getElementById( 'wpDestFile' );
-			if ( e ) {
-				e.value = '';
+			$spinnerDestCheck = $.createSpinner().insertAfter( '#wpDestFile' );
+
+			( new mw.Api() ).get( {
+				action: 'query',
+				titles: ( new mw.Title( this.nameToCheck, mw.config.get( 'wgNamespaceIds' ).file ) ).getPrefixedText(),
+				prop: 'imageinfo',
+				iiprop: 'uploadwarning',
+				indexpageids: ''
+			} ).done( function ( result ) {
+				var resultOut = '';
+				if ( result.query ) {
+					resultOut = result.query.pages[result.query.pageids[0]].imageinfo[0];
+				}
+				$spinnerDestCheck.remove();
+				uploadWarning.processResult( resultOut, uploadWarning.nameToCheck );
+			} );
+		},
+
+		processResult: function ( result, fileName ) {
+			this.setWarning( result.html );
+			this.responseCache[fileName] = result.html;
+		},
+
+		setWarning: function ( warning ) {
+			$( '#wpDestFile-warning' ).html( warning );
+
+			// Set a value in the form indicating that the warning is acknowledged and
+			// doesn't need to be redisplayed post-upload
+			if ( !warning ) {
+				$( '#wpDestFileWarningAck' ).val( '' );
+			} else {
+				$( '#wpDestFileWarningAck' ).val( '1' );
 			}
 
-			return false;
 		}
-	}
-
-	// Replace spaces by underscores
-	fname = fname.replace( / /g, '_' );
-	// Capitalise first letter if needed
-	if ( mw.config.get( 'wgCapitalizeUploads' ) ) {
-		fname = fname.charAt( 0 ).toUpperCase().concat( fname.substring( 1, 10000 ) );
-	}
-
-	// Output result
-	destFile = document.getElementById( 'wpDestFile' );
-	if ( destFile ) {
-		// Call decodeURIComponent function to remove possible URL-encoded characters
-		// from the file name (bug 30390). Especially likely with upload-form-url.
-		// decodeURIComponent can throw an exception in input is invalid utf-8
-		try {
-			destFile.value = decodeURIComponent( fname );
-		} catch ( err ) {
-			destFile.value = fname;
-		}
-		wgUploadWarningObj.checkNow( fname );
-	}
-};
-
-window.toggleFilenameFiller = function () {
-	if ( !document.getElementById ) {
-		return;
-	}
-	var destName = document.getElementById( 'wpDestFile' ).value;
-	mw.config.set( 'wgUploadAutoFill', !destName );
-};
+	};
 
-wgUploadLicenseObj = window.wgUploadLicenseObj = {
+	uploadLicense = {
 
-	responseCache: { '': '' },
+		responseCache: { '': '' },
 
-	fetchPreview: function ( license ) {
-		var cached, title;
-		if ( !mw.config.get( 'wgAjaxLicensePreview' ) ) {
-			return;
-		}
-		for ( cached in this.responseCache ) {
-			if ( cached === license ) {
+		fetchPreview: function ( license ) {
+			var $spinnerLicense;
+			if ( !mw.config.get( 'wgAjaxLicensePreview' ) ) {
+				return;
+			}
+			if ( this.responseCache.hasOwnProperty( license ) ) {
 				this.showPreview( this.responseCache[license] );
 				return;
 			}
-		}
 
-		$spinnerLicense = $.createSpinner().insertAfter( '#wpLicense' );
+			$spinnerLicense = $.createSpinner().insertAfter( '#wpLicense' );
 
-		title = document.getElementById( 'wpDestFile' ).value;
-		if ( !title ) {
-			title = 'File:Sample.jpg';
-		}
-
-		( new mw.Api() ).get( {
-			action: 'parse',
-			text: '{{' + license + '}}',
-			title: title,
-			prop: 'text',
-			pst: ''
-		} ).done( function ( result ) {
-			wgUploadLicenseObj.processResult( result, license );
-		} );
-	},
+			( new mw.Api() ).get( {
+				action: 'parse',
+				text: '{{' + license + '}}',
+				title: $( '#wpDestFile' ).val() || 'File:Sample.jpg',
+				prop: 'text',
+				pst: ''
+			} ).done( function ( result ) {
+				$spinnerLicense.remove();
+				uploadLicense.processResult( result, license );
+			} );
+		},
 
-	processResult: function ( result, license ) {
-		$spinnerLicense.remove();
-		$spinnerLicense = undefined;
-		this.responseCache[license] = result.parse.text['*'];
-		this.showPreview( this.responseCache[license] );
-	},
+		processResult: function ( result, license ) {
+			this.responseCache[license] = result.parse.text['*'];
+			this.showPreview( this.responseCache[license] );
+		},
 
-	showPreview: function ( preview ) {
-		var previewPanel = document.getElementById( 'mw-license-preview' );
-		if ( previewPanel.innerHTML !== preview ) {
-			previewPanel.innerHTML = preview;
+		showPreview: function ( preview ) {
+			$( '#mw-license-preview' ).html( preview );
 		}
-	}
 
-};
+	};
 
-$( uploadSetup );
+	$( function () {
+		// Disable URL box if the URL copy upload source type is not selected
+		if ( !$( '#wpSourceTypeurl' ).prop( 'checked' ) ) {
+			$( '#wpUploadFileURL' ).prop( 'disabled', true );
+		}
+
+		// AJAX wpDestFile warnings
+		if ( ajaxUploadDestCheck ) {
+			// Insert an event handler that fetches upload warnings when wpDestFile
+			// has been changed
+			$( '#wpDestFile' ).change( function () {
+				uploadWarning.checkNow( $( this ).val() );
+			} );
+			// Insert a row where the warnings will be displayed just below the
+			// wpDestFile row
+			$( '#mw-htmlform-description tbody' ).append(
+				$( '<tr>' ).append(
+					$( '<td>' )
+						.attr( 'id', 'wpDestFile-warning' )
+						.attr( 'colspan', 2 )
+				)
+			);
+		}
+
+		if ( mw.config.get( 'wgAjaxLicensePreview' ) && $license.length ) {
+			// License selector check
+			$license.change( function () {
+				// We might show a preview
+				uploadLicense.fetchPreview( $license.val() );
+			} );
+
+			// License selector table row
+			$license.closest( 'tr' ).after(
+				$( '<tr>' ).append(
+					$( '<td>' ),
+					$( '<td>' ).attr( 'id', 'mw-license-preview' )
+				)
+			);
+		}
+
+		// fillDestFile setup
+		$.each( mw.config.get( 'wgUploadSourceIds' ), function ( index, sourceId ) {
+			$( '#' + sourceId ).change( function () {
+				var path, slash, backslash, fname;
+				if ( !mw.config.get( 'wgUploadAutoFill' ) ) {
+					return;
+				}
+				// Remove any previously flagged errors
+				$( '#mw-upload-permitted' ).attr( 'class', '' );
+				$( '#mw-upload-prohibited' ).attr( 'class', '' );
+
+				path = $( this ).val();
+				// Find trailing part
+				slash = path.lastIndexOf( '/' );
+				backslash = path.lastIndexOf( '\\' );
+				if ( slash === -1 && backslash === -1 ) {
+					fname = path;
+				} else if ( slash > backslash ) {
+					fname = path.substring( slash + 1 );
+				} else {
+					fname = path.substring( backslash + 1 );
+				}
+
+				// Clear the filename if it does not have a valid extension.
+				// URLs are less likely to have a useful extension, so don't include them in the
+				// extension check.
+				if (
+					mw.config.get( 'wgStrictFileExtensions' ) &&
+					mw.config.get( 'wgFileExtensions' ) &&
+					$( this ).attr( 'id' ) !== 'wpUploadFileURL'
+				) {
+					if (
+						fname.lastIndexOf( '.' ) === -1 ||
+						$.inArray(
+							fname.substr( fname.lastIndexOf( '.' ) + 1 ).toLowerCase(),
+							$.map( mw.config.get( 'wgFileExtensions' ), function ( element ) {
+								return element.toLowerCase();
+							} )
+						) === -1
+					) {
+						// Not a valid extension
+						// Clear the upload and set mw-upload-permitted to error
+						$( this ).val( '' );
+						$( '#mw-upload-permitted' ).attr( 'class', 'error' );
+						$( '#mw-upload-prohibited' ).attr( 'class', 'error' );
+						// Clear wpDestFile as well
+						$( '#wpDestFile' ).val( '' );
+
+						return false;
+					}
+				}
 
+				// Replace spaces by underscores
+				fname = fname.replace( / /g, '_' );
+				// Capitalise first letter if needed
+				if ( mw.config.get( 'wgCapitalizeUploads' ) ) {
+					fname = fname.charAt( 0 ).toUpperCase().concat( fname.substring( 1 ) );
+				}
+
+				// Output result
+				if ( $( '#wpDestFile' ).length ) {
+					// Call decodeURIComponent function to remove possible URL-encoded characters
+					// from the file name (bug 30390). Especially likely with upload-form-url.
+					// decodeURIComponent can throw an exception if input is invalid utf-8
+					try {
+						$( '#wpDestFile' ).val( decodeURIComponent( fname ) );
+					} catch ( err ) {
+						$( '#wpDestFile' ).val( fname );
+					}
+					uploadWarning.checkNow( fname );
+				}
+			} );
+		} );
+	} );
 }( mediaWiki, jQuery ) );