X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki.ForeignStructuredUpload.BookletLayout%2FBookletLayout.js;h=9974e2bd3b71e4436ceb128e6f83399150659b74;hp=7d4ed537d7aaa9124cef25a055cde69a21780900;hb=6f3d5a5204770b7e9076ec0c956631c32a9e1114;hpb=c413d15d183cad695ab68b77bf384c43cf1047dc

diff --git a/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js b/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js
index 7d4ed537d7..9974e2bd3b 100644
--- a/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js
+++ b/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js
@@ -1,5 +1,5 @@
 /* global moment, Uint8Array */
-( function ( $, mw ) {
+( function () {
 
 	/**
 	 * mw.ForeignStructuredUpload.BookletLayout encapsulates the process
@@ -148,8 +148,7 @@
 
 		// These elements are filled with text in #initialize
 		// TODO Refactor this to be in one place
-		this.$ownWorkMessage = $( '<p>' )
-			.addClass( 'mw-foreignStructuredUpload-bookletLayout-license' );
+		this.$ownWorkMessage = $( '<p>' );
 		this.$notOwnWorkMessage = $( '<p>' );
 		this.$notOwnWorkLocal = $( '<p>' );
 
@@ -173,10 +172,9 @@
 			} ),
 			new OO.ui.FieldLayout( this.ownWorkCheckbox, {
 				align: 'inline',
-				label: $( '<div>' ).append(
-					$( '<p>' ).text( mw.msg( 'upload-form-label-own-work' ) ),
-					this.$ownWorkMessage
-				)
+				label: mw.msg( 'upload-form-label-own-work' ),
+				help: this.$ownWorkMessage,
+				helpInline: true
 			} ),
 			new OO.ui.FieldLayout( this.messageLabel, {
 				align: 'top'
@@ -254,14 +252,14 @@
 		this.filenameField = new OO.ui.FieldLayout( this.filenameWidget, {
 			label: mw.msg( 'upload-form-label-infoform-name' ),
 			align: 'top',
-			classes: [ 'mw-foreignStructuredUploa-bookletLayout-small-notice' ],
-			notices: [ mw.msg( 'upload-form-label-infoform-name-tooltip' ) ]
+			help: mw.msg( 'upload-form-label-infoform-name-tooltip' ),
+			helpInline: true
 		} );
 		this.descriptionField = new OO.ui.FieldLayout( this.descriptionWidget, {
 			label: mw.msg( 'upload-form-label-infoform-description' ),
 			align: 'top',
-			classes: [ 'mw-foreignStructuredUploa-bookletLayout-small-notice' ],
-			notices: [ mw.msg( 'upload-form-label-infoform-description-tooltip' ) ]
+			help: mw.msg( 'upload-form-label-infoform-description-tooltip' ),
+			helpInline: true
 		} );
 		this.categoriesField = new OO.ui.FieldLayout( this.categoriesWidget, {
 			label: mw.msg( 'upload-form-label-infoform-categories' ),
@@ -370,12 +368,15 @@
 	 * @inheritdoc
 	 */
 	mw.ForeignStructuredUpload.BookletLayout.prototype.getText = function () {
-		var language = mw.config.get( 'wgContentLanguage' );
+		var language = mw.config.get( 'wgContentLanguage' ),
+			categories = this.categoriesWidget.getItems().map( function ( item ) {
+				return item.data;
+			} );
 		this.upload.clearDescriptions();
 		this.upload.addDescription( language, this.descriptionWidget.getValue() );
 		this.upload.setDate( this.dateWidget.getValue() );
 		this.upload.clearCategories();
-		this.upload.addCategories( this.categoriesWidget.getItemsData() );
+		this.upload.addCategories( categories );
 		return this.upload.getText();
 	};
 
@@ -454,8 +455,8 @@
 		mw.ForeignStructuredUpload.BookletLayout.parent.prototype.clear.call( this );
 
 		this.ownWorkCheckbox.setSelected( false );
-		this.categoriesWidget.setItemsFromData( [] );
+		this.categoriesWidget.setValue( [] );
 		this.dateWidget.setValue( '' ).setValidityFlag( true );
 	};
 
-}( jQuery, mediaWiki ) );
+}() );