http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76864
Revision: 76864
Author: neilk
Date: 2010-11-17 00:16:31 +0000 (Wed, 17 Nov 2010)
Log Message:
-----------
make failure fail
Modified Paths:
--------------
trunk/extensions/UploadWizard/resources/mw.ApiUploadHandler.js
trunk/extensions/UploadWizard/resources/mw.IframeTransport.js
trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
Added Paths:
-----------
trunk/extensions/UploadWizard/resources/16px-Gnome-process-stop.svg.png
Added: trunk/extensions/UploadWizard/resources/16px-Gnome-process-stop.svg.png
===================================================================
(Binary files differ)
Property changes on:
trunk/extensions/UploadWizard/resources/16px-Gnome-process-stop.svg.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: trunk/extensions/UploadWizard/resources/mw.ApiUploadHandler.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.ApiUploadHandler.js
2010-11-17 00:05:35 UTC (rev 76863)
+++ trunk/extensions/UploadWizard/resources/mw.ApiUploadHandler.js
2010-11-17 00:16:31 UTC (rev 76864)
@@ -22,7 +22,9 @@
this.transport = new mw.IframeTransport(
this.$form,
function( fraction ){ _this.upload.setTransportProgress(
fraction ); },
- function( result ) { _this.upload.setTransported( result ); }
+ function( result ) {
+ _this.upload.setTransported( result );
+ }
);
};
Modified: trunk/extensions/UploadWizard/resources/mw.IframeTransport.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.IframeTransport.js
2010-11-17 00:05:35 UTC (rev 76863)
+++ trunk/extensions/UploadWizard/resources/mw.IframeTransport.js
2010-11-17 00:16:31 UTC (rev 76864)
@@ -56,6 +56,7 @@
// Set up the completion callback
var _this = this;
$j( '#' + this.iframeId ).load( function() {
+ debugger;
mw.log( "received result in iframe" );
_this.progressCb( 1.0 );
_this.processIframeResult( $j( this ).get( 0 ) );
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizard.js 2010-11-17
00:05:35 UTC (rev 76863)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizard.js 2010-11-17
00:16:31 UTC (rev 76864)
@@ -99,12 +99,12 @@
*/
setTransported: function( result ) {
var _this = this;
- _this.state = 'transported';
- _this.transportProgress = 1;
- $j( _this.ui.div ).trigger( 'transportedEvent' );
if ( result.upload && result.upload.imageinfo ) {
// success
+ _this.state = 'transported';
+ _this.transportProgress = 1;
+ _this.ui.showTransported();
_this.extractUploadInfo( result );
_this.deedPreview.setup();
_this.details.populate();
@@ -119,11 +119,11 @@
// and other errors that result in a stash
} else {
// XXX handle errors better
+ _this.state = 'error';
+ _this.ui.showFailed();
if ( result.error ) {
alert( "error : " + result.error.code + " : " +
result.error.info );
}
- this.ui.showFailed();
- alert("huh?");
// TODO now we should tag the upload as failed
// if can recover, should maybe allow re-uploading.
}
@@ -338,7 +338,7 @@
// _this.progressBar = ( no progress bar for individual uploads yet )
// we bind to the ui div since unbind doesn't work for non-DOM objects
$j( _this.div ).bind( 'transportProgressEvent', function(e) {
_this.showTransportProgress(); } );
- $j( _this.div ).bind( 'transportedEvent', function(e) {
_this.showTransported(); } );
+ // $j( _this.div ).bind( 'transportedEvent', function(e) {
_this.showTransported(); } );
};
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
