jenkins-bot has submitted this change and it was merged.
Change subject: Consistently pass config in uw.controller.Step subclasses
......................................................................
Consistently pass config in uw.controller.Step subclasses
Change-Id: Ice5f63d6a2500af38b5c39cdaf2399c412042a85
---
M resources/controller/uw.controller.Thanks.js
M resources/controller/uw.controller.Tutorial.js
M resources/mw.UploadWizard.js
3 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/controller/uw.controller.Thanks.js
b/resources/controller/uw.controller.Thanks.js
index 50931c8..644dc45 100644
--- a/resources/controller/uw.controller.Thanks.js
+++ b/resources/controller/uw.controller.Thanks.js
@@ -28,7 +28,8 @@
new uw.ui.Thanks( config )
.connect( this, {
'reset-wizard': [ 'emit',
'reset-wizard' ]
- } )
+ } ),
+ config
);
this.stepName = 'thanks';
diff --git a/resources/controller/uw.controller.Tutorial.js
b/resources/controller/uw.controller.Tutorial.js
index ac644fd..a64c382 100644
--- a/resources/controller/uw.controller.Tutorial.js
+++ b/resources/controller/uw.controller.Tutorial.js
@@ -16,7 +16,7 @@
*/
( function ( mw, uw, $, OO ) {
- uw.controller.Tutorial = function UWControllerTutorial( api ) {
+ uw.controller.Tutorial = function UWControllerTutorial( api, config ) {
var controller = this;
this.shouldSkipTutorial = false;
this.api = api;
@@ -35,7 +35,8 @@
.on( 'helpdesk-click', function () {
( new mw.UploadWizardTutorialEvent(
'helpdesk-click' ) ).dispatch();
- } )
+ } ),
+ config
);
this.stepName = 'tutorial';
diff --git a/resources/mw.UploadWizard.js b/resources/mw.UploadWizard.js
index c1e3ef3..c96c93a 100644
--- a/resources/mw.UploadWizard.js
+++ b/resources/mw.UploadWizard.js
@@ -197,7 +197,7 @@
var wizard = this;
this.steps = {
- tutorial: new uw.controller.Tutorial( this.api
),
+ tutorial: new uw.controller.Tutorial( this.api,
this.config ),
file: new uw.controller.Upload( this.config )
.on( 'flickr-ui-init', function () {
--
To view, visit https://gerrit.wikimedia.org/r/277846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice5f63d6a2500af38b5c39cdaf2399c412042a85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits