38317

assets/www/app.css

@@ -392,6 +392,10 @@ header .back {
 	tap-highlight-color: rgba( 0, 0, 0, 0 );
 }
 
+.back:disabled {
+	opacity: 0.2;
+}
+
 /* upload page */
 #upload-page .popup {
 	text-align: center;

assets/www/js/app.js

@@ -552,6 +552,17 @@ require( [ 'jquery', 'l10n', 'geo', 'api', 'templates', 'monuments', 'monument',
 		return displayError( code, info, info ? true : false );
 	}
 
+	function uploadProgressHandler( state ) {
+		$( '#upload-progress-page .back' ).attr( 'disabled', false );
+		if( state === 'starting' ) {
+			$( '#upload-progress-state' ).html( mw.msg( 'upload-progress-starting' ) );
+			showPage( 'upload-progress-page' );
+		} else if ( state === 'in-progress' ) {
+			$( '#upload-progress-page .back' ).attr( 'disabled', true );
+			$( '#upload-progress-state' ).html( mw.msg( 'upload-progress-in-progress' ) );
+		}
+	}
+
 	function showPhotoConfirmation(fileUrl) {
 		var comment = mw.msg( 'upload-comment', WLMConfig.VERSION_NUMBER );
 		var uploadConfirmTemplate = templates.getTemplate('upload-confirm-template');
@@ -591,14 +602,7 @@ require( [ 'jquery', 'l10n', 'geo', 'api', 'templates', 'monuments', 'monument',
 				goBack(); // undo back button to skip upload progress page
 				goBack(); // undo back button to skip upload form
 				showPage( 'upload-latest-page' );
-			} ).progress( function( state ) {
-				if( state === 'starting' ) {
-					$( '#upload-progress-state' ).html(mw.msg( 'upload-progress-starting' ));
-					showPage("upload-progress-page");
-				} else if ( state === 'in-progress' ) {
-					$("#upload-progress-state").html(mw.msg("upload-progress-in-progress"));
-				}
-			} ).fail( function( data ) {
+			} ).progress( uploadProgressHandler ).fail( function( data ) {
 				var container;
 				if (data == "Aborted") {
 					// no-op
@@ -1077,7 +1081,9 @@ require( [ 'jquery', 'l10n', 'geo', 'api', 'templates', 'monuments', 'monument',
 		// allow cancellation of current api upload request
 		$( '#upload-progress-page .back' ).click( function() {
 			console.log( 'request to cancel upload' );
-			api.cancel();
+			if ( !$( this ).is( ':disabled' ) ) {
+				api.cancel();
+			}
 		});
 
 		// setup dropdowns that allow switching a page
@@ -1120,7 +1126,8 @@ require( [ 'jquery', 'l10n', 'geo', 'api', 'templates', 'monuments', 'monument',
 			resolveImageThumbnail: resolveImageThumbnail,
 			showPage: showPage,
 			translateAdminLevels: translateAdminLevels,
-			uploadErrorHandler: uploadErrorHandler
+			uploadErrorHandler: uploadErrorHandler,
+			uploadProgressHandler: uploadProgressHandler
 		},
 		commonsApi: commonsApi,
 		db: db,

assets/www/js/page-uploads.js

@@ -2,6 +2,7 @@
 /*jslint sloppy: true, white:true, maxerr: 50, indent: 4, plusplus: true, vars:true */
 define( [ 'jquery' ], function() {
 	var api, db, templates, commonsApi, showMonumentDetail, showPage, translateAdminLevels,
+		app,
 		doLogin, uploadErrorHandler,
 		uploadsRendered = 0, // For display caching: compare vs db.dirty
 		incompleteUploadsRendered = 0,
@@ -218,14 +219,7 @@ define( [ 'jquery' ], function() {
 						db.completeUpload( photo ).done( function() {
 							iter();
 						} );
-					} ).progress( function( state ) {
-						if( state === 'starting' ) {
-							$( '#upload-progress-state' ).html(mw.msg( 'upload-progress-starting' ));
-							showPage("upload-progress-page");
-						} else if ( state === 'in-progress' ) {
-							$("#upload-progress-state").html(mw.msg("upload-progress-in-progress"));
-						}
-					} ).fail( function( data ) {
+					} ).progress( app.uploadProgressHandler ).fail( function( data ) {
 						// @todo show error data here
 						if ( data === 'Aborted' ) {
 							// no-op
@@ -245,6 +239,7 @@ define( [ 'jquery' ], function() {
 	}
 
 	function UploadPage( WLMMobile ) {
+		app = WLMMobile.app;
 		api = WLMMobile.api;
 		db = WLMMobile.db;
 		Monument = WLMMobile.Monument;