Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247513
Change subject: mw.ForeignStructuredUpload.BookletLayout: Use lastModified as
default date
......................................................................
mw.ForeignStructuredUpload.BookletLayout: Use lastModified as default date
Use the file's lastModified date as the default value of the
DateInputWidget instead of leaving it blank.
Change-Id: I75adec9718d89a7177050e8b848478d1b0069dd0
---
M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
M resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
2 files changed, 18 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/13/247513/1
diff --git
a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
index 5a7e62e..e81fe4c 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
@@ -132,7 +132,8 @@
* @inheritdoc
*/
mw.ForeignStructuredUpload.BookletLayout.prototype.renderInfoForm =
function () {
- var fieldset;
+ var fieldset,
+ layout = this;
this.filenameWidget = new OO.ui.TextInputWidget( {
required: true,
@@ -144,13 +145,19 @@
multiline: true,
autosize: true
} );
+ this.categoriesWidget = new mw.widgets.CategorySelector( {
+ $overlay: this.$overlay
+ } );
this.dateWidget = new mw.widgets.DateInputWidget( {
$overlay: this.$overlay,
required: true,
mustBeBefore: moment().add( 1, 'day' ).locale( 'en'
).format( 'YYYY-MM-DD' ) // Tomorrow
} );
- this.categoriesWidget = new mw.widgets.CategorySelector( {
- $overlay: this.$overlay
+
+ // Set the date to lastModified once the upload starts
+ this.on( 'uploadInitiated', function () {
+ var lastModified = moment(
layout.upload.getFile().lastModified );
+ layout.dateWidget.setValue( lastModified.format(
'YYYY-MM-DD') );
} );
fieldset = new OO.ui.FieldsetLayout( {
diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 7b307ee..aaa952b 100644
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -97,6 +97,12 @@
/* Events */
/**
+ * The file has started uploading
+ *
+ * @event uploadInitiated
+ */
+
+ /**
* The file has finished uploading
*
* @event fileUploaded
@@ -172,6 +178,7 @@
*
* @protected
* @fires fileUploaded
+ * @fires uploadInitiated
* @return {jQuery.Promise}
*/
mw.Upload.BookletLayout.prototype.uploadFile = function () {
@@ -185,6 +192,7 @@
this.upload.setFile( file );
// Explicitly set the filename so that the old filename isn't
used in case of retry
this.upload.setFilenameFromFile();
+ this.emit( 'uploadInitiated' );
this.uploadPromise = this.upload.uploadToStash();
this.uploadPromise.then( function () {
--
To view, visit https://gerrit.wikimedia.org/r/247513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75adec9718d89a7177050e8b848478d1b0069dd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
