jenkins-bot has submitted this change and it was merged.
Change subject: Various Flickr interface fixes
......................................................................
Various Flickr interface fixes
This is hopeless.
Change-Id: I5e151a0a7bc00d694244ff72b79999cdc2348723
---
M resources/mw.FlickrChecker.js
M resources/mw.UploadWizard.js
M resources/ui/uw.ui.Upload.js
3 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mw.FlickrChecker.js b/resources/mw.FlickrChecker.js
index a4276bb..8fb1d2a 100644
--- a/resources/mw.FlickrChecker.js
+++ b/resources/mw.FlickrChecker.js
@@ -10,7 +10,7 @@
this.selectButton = new OO.ui.ButtonWidget( {
id: 'mwe-upwiz-select-flickr',
- label: mw.message( 'mwe-upwiz-add-file-0-free' ),
+ label: mw.message( 'mwe-upwiz-add-file-0-free' ).text(),
flags: [ 'constructive', 'primary' ]
} );
@@ -451,6 +451,7 @@
checker.setUploadDescription(
checker.imageUploads[ image ] );
checker.setImageURL( image );
} );
+ checker.wizard.flickrInterfaceDestroy();
} );
if ( checker.imageUploads.length === 0 ) {
diff --git a/resources/mw.UploadWizard.js b/resources/mw.UploadWizard.js
index 7038bbc..6a1b256 100644
--- a/resources/mw.UploadWizard.js
+++ b/resources/mw.UploadWizard.js
@@ -231,7 +231,7 @@
$( '#mwe-upwiz-flickr-input' ).val( '' );
$( '#mwe-upwiz-flickr-select-list' ).empty();
$( '#mwe-upwiz-flickr-select-list-container' ).unbind();
- $( '#mwe-upwiz-select-flickr' ).unbind();
+ $( '#mwe-upwiz-select-flickr' ).remove();
$( '#mwe-upwiz-flickr-select-list-container' ).hide();
$( '#mwe-upwiz-upload-add-flickr-container' ).hide();
$( '#mwe-upwiz-upload-add-flickr' ).prop( 'disabled',
true );
diff --git a/resources/ui/uw.ui.Upload.js b/resources/ui/uw.ui.Upload.js
index 5b208ab..52a16e2 100644
--- a/resources/ui/uw.ui.Upload.js
+++ b/resources/ui/uw.ui.Upload.js
@@ -260,7 +260,8 @@
if ( this.isFlickrImportEnabled() ) {
// changes the flickr add button to "add more files
from flickr" if necessary.
this.addFlickrFile.setLabel( mw.message( fmsg ).text()
);
- this.$flickrAddFileContainer.show();
+ // jQuery likes to restore the wrong 'display' value
when doing .show()
+ this.$flickrAddFileContainer.css( 'display', '' );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/256675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e151a0a7bc00d694244ff72b79999cdc2348723
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: 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
