Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/344592 )
Change subject: ForeignStructuredUpload.BookletLayout: Use CategorySelectorWidget ...................................................................... ForeignStructuredUpload.BookletLayout: Use CategorySelectorWidget ...instead of CategorySelector Bug: T161285 Change-Id: Icd9bb162caa63c5a43f90e31818fc1432c6d66be --- M resources/Resources.php M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/92/344592/1 diff --git a/resources/Resources.php b/resources/Resources.php index bbc1908..1ce9f99 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1307,7 +1307,7 @@ 'dependencies' => [ 'mediawiki.ForeignStructuredUpload', 'mediawiki.Upload.BookletLayout', - 'mediawiki.widgets.CategorySelector', + 'mediawiki.widgets.CategorySelectorWidget', 'mediawiki.widgets.DateInputWidget', 'mediawiki.jqueryMsg', 'mediawiki.api.messages', diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js index f2b6f5f..9d505e3 100644 --- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js +++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js @@ -46,11 +46,11 @@ return mw.ForeignStructuredUpload.BookletLayout.parent.prototype.initialize.call( this ).then( function () { return $.when( - // Point the CategorySelector to the right wiki + // Point the CategorySelectorWidget to the right wiki booklet.upload.getApi().then( function ( api ) { // If this is a ForeignApi, it will have a apiUrl, otherwise we don't need to do anything if ( api.apiUrl ) { - // Can't reuse the same object, CategorySelector calls #abort on its mw.Api instance + // Can't reuse the same object, CategorySelectorWidget calls #abort on its mw.Api instance booklet.categoriesWidget.api = new mw.ForeignApi( api.apiUrl ); } return $.Deferred().resolve(); @@ -242,7 +242,7 @@ multiline: true, autosize: true } ); - this.categoriesWidget = new mw.widgets.CategorySelector( { + this.categoriesWidget = new mw.widgets.CategorySelectorWidget( { // Can't be done here because we don't know the target wiki yet... done in #initialize. // api: new mw.ForeignApi( ... ), $overlay: this.$overlay -- To view, visit https://gerrit.wikimedia.org/r/344592 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd9bb162caa63c5a43f90e31818fc1432c6d66be Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna <psax...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits