MarkTraceur has uploaded a new change for review.
https://gerrit.wikimedia.org/r/187415
Change subject: Use OOUI checkboxes for metadata copying
......................................................................
Use OOUI checkboxes for metadata copying
Change-Id: I823740f71ed0c786e4c47f610c83b7ff9d3083dc
---
M UploadWizardHooks.php
M resources/mw.UploadWizardDetails.js
2 files changed, 22 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/15/187415/1
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index c9c0704..f85685a 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -16,7 +16,6 @@
'ext.uploadWizard' => array(
'dependencies' => array(
'jquery.arrowSteps',
- 'jquery.checkboxShiftClick',
'jquery.client',
'jquery.ui.core',
'jquery.ui.dialog',
diff --git a/resources/mw.UploadWizardDetails.js
b/resources/mw.UploadWizardDetails.js
index a830575..23ad181 100644
--- a/resources/mw.UploadWizardDetails.js
+++ b/resources/mw.UploadWizardDetails.js
@@ -722,9 +722,10 @@
*/
buildAndShowCopyMetadata: function () {
var copyButton,
+ copyTypes = {},
+ fieldset = new OO.ui.FieldsetLayout(),
details = this,
- $copyMetadataDiv = $( '<div
class="mwe-upwiz-metadata-copier"></div>' ),
- $checkboxes = $();
+ $copyMetadataDiv = $( '<div
class="mwe-upwiz-metadata-copier"></div>' );
if ( mw.UploadWizard.config.copyMetadataFeature !==
true ||
this.copyMetadataCtrlDiv !== undefined ) {
@@ -733,34 +734,38 @@
this.copyMetadataCtrlDiv = $( '<div
class="mwe-upwiz-details-copy-metadata"></div>' );
- $.each( this.copyMetadataTypes, function
addToMetadataDiv( metadataName, defaultStatus ) {
- var copyMessage = 'mwe-upwiz-copy-' +
metadataName,
- copyMetadataMsg,
- $checkbox;
+ $copyMetadataDiv.append( fieldset.$element );
+
+ $.each( this.copyMetadataTypes, function (
metadataName, defaultStatus ) {
+ var copyMetadataMsg, checkbox, field,
+ copyMessage = 'mwe-upwiz-copy-' +
metadataName;
+
if ( metadataName === 'description' ||
metadataName === 'categories' ) {
copyMetadataMsg = mw.message(
copyMessage, 1 ).text();
} else {
copyMetadataMsg = mw.message(
copyMessage ).text();
}
- $checkbox = $( '<input>' ).attr( 'type',
'checkbox' ).attr( 'name', copyMessage ).attr( 'id', copyMessage );
- $checkboxes = $checkboxes.add( $checkbox );
- if ( defaultStatus === true ) {
- $checkbox.prop( 'checked', true );
- }
- $copyMetadataDiv
- .append( $checkbox )
- .append( $( '<label for="' +
copyMessage + '"></label>' ).text( copyMetadataMsg ) )
- .append( $( '<br />' ) );
+ checkbox = new OO.ui.CheckboxInputWidget( {
+ selected: defaultStatus
+ } );
+
+ copyTypes[metadataName] = checkbox;
+
+ field = new OO.ui.FieldLayout( checkbox, {
+ label: copyMetadataMsg,
+ align: 'inline'
+ } );
+
+ fieldset.addItems( [ field ] );
} ) ;
- $checkboxes.checkboxShiftClick();
copyButton = new OO.ui.ButtonWidget( {
label: mw.message(
'mwe-upwiz-copy-metadata-button' ).text(),
flags: [ 'constructive' ]
} ).on( 'click', function () {
$.each( details.copyMetadataTypes, function (
metadataType ) {
- if ( $( '#mwe-upwiz-copy-' +
metadataType ).is( ':checked' ) ) {
+ if (
copyTypes[metadataType].isSelected() ) {
details.copyMetadata(
metadataType );
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/187415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I823740f71ed0c786e4c47f610c83b7ff9d3083dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
