-/* global moment*/
+/* global moment */
( function ( $, mw, moment ) {
/**
function ( userInfo ) {
if ( userInfo.rights.indexOf( 'upload' ) === -1 ) {
if ( mw.user.isAnon() ) {
- booklet.getPage( 'upload' ).$element.msg( 'api-error-mustbeloggedin' );
+ booklet.getPage( 'upload' ).$element.msg( 'apierror-mustbeloggedin', mw.msg( 'action-upload' ) );
} else {
- booklet.getPage( 'upload' ).$element.msg( 'api-error-badaccess-groups' );
+ booklet.getPage( 'upload' ).$element.msg( 'apierror-permissiondenied', mw.msg( 'action-upload' ) );
}
}
return $.Deferred().resolve();
* @return {mw.Upload} Upload model
*/
mw.Upload.BookletLayout.prototype.createUpload = function () {
- return new mw.Upload();
+ return new mw.Upload( {
+ parameters: {
+ errorformat: 'html',
+ errorlang: mw.config.get( 'wgUserLanguage' ),
+ errorsuselocal: 1,
+ formatversion: 2
+ }
+ } );
};
/* Uploading */
*/
mw.Upload.BookletLayout.prototype.uploadFile = function () {
var deferred = $.Deferred(),
- startTime = new Date(),
+ startTime = mw.now(),
layout = this,
file = this.getFile();
deferred.reject( errorMessage );
} );
}, function ( progress ) {
- var elapsedTime = new Date() - startTime,
+ var elapsedTime = mw.now() - startTime,
estimatedTotalTime = ( 1 / progress ) * elapsedTime,
estimatedRemainingTime = moment.duration( estimatedTotalTime - elapsedTime );
layout.emit( 'fileUploadProgress', progress, estimatedRemainingTime );
* @return {jQuery.Promise} A Promise that will be resolved with an OO.ui.Error.
*/
mw.Upload.BookletLayout.prototype.getErrorMessageForStateDetails = function () {
- var message,
- state = this.upload.getState(),
+ var state = this.upload.getState(),
stateDetails = this.upload.getStateDetails(),
- error = stateDetails.error,
- warnings = stateDetails.upload && stateDetails.upload.warnings;
+ error = stateDetails.errors ? stateDetails.errors[ 0 ] : false,
+ warnings = stateDetails.upload && stateDetails.upload.warnings,
+ $ul = $( '<ul>' ),
+ errorText;
if ( state === mw.Upload.State.ERROR ) {
if ( !error ) {
+ if ( stateDetails.textStatus === 'timeout' ) {
+ // in case of $.ajax.fail(), there is no response json
+ errorText = mw.message( 'apierror-timeout' ).parse();
+ } else if ( stateDetails.xhr && stateDetails.xhr.status === 0 ) {
+ // failed to even connect to server
+ errorText = mw.message( 'apierror-offline' ).parse();
+ } else if ( stateDetails.textStatus ) {
+ errorText = stateDetails.textStatus;
+ } else {
+ errorText = mw.message( 'apierror-unknownerror', JSON.stringify( stateDetails ) ).parse();
+ }
+
// If there's an 'exception' key, this might be a timeout, or other connection problem
return $.Deferred().resolve( new OO.ui.Error(
- $( '<p>' ).msg( 'api-error-unknownerror', JSON.stringify( stateDetails ) ),
+ $( '<p>' ).html( errorText ),
{ recoverable: false }
) );
}
- // Errors in this format are produced by TitleBlacklist and AbuseFilter. Perhaps other
- // extensions will follow this format in the future.
- if ( error.message ) {
- return this.upload.getApi()
- .then( function ( api ) {
- // 'amenableparser' will expand templates and parser functions server-side.
- // We still do the rest of wikitext parsing here (through jqueryMsg).
- return api.loadMessagesIfMissing( [ error.message.key ], { amenableparser: true } )
- .then( function () {
- if ( !mw.message( error.message.key ).exists() ) {
- return $.Deferred().reject();
- }
- return new OO.ui.Error(
- $( '<p>' ).msg( error.message.key, error.message.params || [] ),
- { recoverable: false }
- );
- } );
- } )
- .then( null, function () {
- // We failed when loading the error message, or it doesn't actually exist, fall back
- return $.Deferred().resolve( new OO.ui.Error(
- $( '<p>' ).msg( 'api-error-unknownerror', JSON.stringify( stateDetails ) ),
- { recoverable: false }
- ) );
- } );
- }
-
- if ( error.code === 'protectedpage' ) {
- message = mw.message( 'protectedpagetext' );
- } else {
- message = mw.message( 'api-error-' + error.code );
- if ( !message.exists() ) {
- message = mw.message( 'api-error-unknownerror', JSON.stringify( stateDetails ) );
- }
- }
return $.Deferred().resolve( new OO.ui.Error(
- $( '<p>' ).append( message.parseDom() ),
+ $( '<p>' ).html( error.html ),
{ recoverable: false }
) );
}
// We could get more than one of these errors, these are in order
// of importance. For example fixing the thumbnail like file name
// won't help the fact that the file already exists.
- if ( warnings.stashfailed !== undefined ) {
- return $.Deferred().resolve( new OO.ui.Error(
- $( '<p>' ).msg( 'api-error-stashfailed' ),
- { recoverable: false }
- ) );
- } else if ( warnings.exists !== undefined ) {
+ if ( warnings.exists !== undefined ) {
return $.Deferred().resolve( new OO.ui.Error(
$( '<p>' ).msg( 'fileexists', 'File:' + warnings.exists ),
{ recoverable: false }
{ recoverable: false }
) );
} else if ( warnings.duplicate !== undefined ) {
+ $.each( warnings.duplicate, function ( i, filename ) {
+ var $a = $( '<a>' ).text( filename ),
+ href = mw.Title.makeTitle( mw.config.get( 'wgNamespaceIds' ).file, filename ).getUrl( {} );
+
+ $a.attr( { href: href, target: '_blank' } );
+ $ul.append( $( '<li>' ).append( $a ) );
+ } );
+
return $.Deferred().resolve( new OO.ui.Error(
- $( '<p>' ).msg( 'api-error-duplicate', warnings.duplicate.length ),
+ $( '<p>' ).msg( 'file-exists-duplicate', warnings.duplicate.length ).append( $ul ),
{ recoverable: false }
) );
} else if ( warnings[ 'thumb-name' ] !== undefined ) {
) );
} else if ( warnings[ 'duplicate-archive' ] !== undefined ) {
return $.Deferred().resolve( new OO.ui.Error(
- $( '<p>' ).msg( 'api-error-duplicate-archive', 1 ),
+ $( '<p>' ).msg( 'file-deleted-duplicate', 'File:' + warnings[ 'duplicate-archive' ] ),
{ recoverable: false }
) );
} else if ( warnings[ 'was-deleted' ] !== undefined ) {
return $.Deferred().resolve( new OO.ui.Error(
- $( '<p>' ).msg( 'api-error-was-deleted' ),
+ $( '<p>' ).msg( 'filewasdeleted', 'File:' + warnings[ 'was-deleted' ] ),
{ recoverable: false }
) );
} else if ( warnings.badfilename !== undefined ) {
required: true,
validate: /.+/
} );
- this.descriptionWidget = new OO.ui.TextInputWidget( {
+ this.descriptionWidget = new OO.ui.MultilineTextInputWidget( {
indicator: 'required',
required: true,
validate: /\S+/,
- multiline: true,
autosize: true
} );
dépôts / lhc / web / wiklou.git / blobdiff