Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/271934
Change subject: Revert "uw.controller.Step: Don't allow more than one
transition to be in progress"
......................................................................
Revert "uw.controller.Step: Don't allow more than one transition to be in
progress"
That was too good to be true. Removing files from the upload list
breaks things now, and trying to fix that breaks other things.
This reverts commit 8a32eb0d990562875a09bc00c1e663aaf7916391.
Change-Id: I0db588566cc76b533861e4b063899b6e266a9ef9
---
M resources/controller/uw.controller.Step.js
1 file changed, 1 insertion(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/34/271934/1
diff --git a/resources/controller/uw.controller.Step.js
b/resources/controller/uw.controller.Step.js
index b84f5c6..10084e4 100644
--- a/resources/controller/uw.controller.Step.js
+++ b/resources/controller/uw.controller.Step.js
@@ -197,11 +197,6 @@
return $.Deferred().resolve();
}
- if ( this.transitioningPromise ) {
- this.needsTransitionRecheck = true;
- return this.transitioningPromise;
- }
-
$.each( this.uploads, function ( i, upload ) {
if ( upload === undefined ) {
return;
@@ -214,21 +209,7 @@
transpromises.push( startNextUpload() );
}
- this.transitioningPromise = $.when.apply( $, transpromises );
- this.transitioningPromise = this.transitioningPromise.then(
function () {
- step.transitioningPromise = null;
- if ( step.needsTransitionRecheck ) {
- // Whoops, we're not actually done. Someone
called transitionAll() again while we were
- // working. Re-run again, and don't resolve the
original promise until then.
- step.needsTransitionRecheck = false;
- return step.transitionAll();
- } else {
- // We're all done!
- return $.Deferred().resolve();
- }
- } );
-
- return this.transitioningPromise;
+ return $.when.apply( $, transpromises );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/271934
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0db588566cc76b533861e4b063899b6e266a9ef9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
