jenkins-bot has submitted this change and it was merged.
Change subject: PhotoUploadOverlay and Progress use View##event
......................................................................
PhotoUploadOverlay and Progress use View##event
PhotoUploadOverlay and PhotoUploadProgress made to use View##events
Bug: T88568
Change-Id: I4004187ab3454a3976d5b84a57576156e78af935
---
M javascripts/modules/uploads/PhotoUploadOverlay.js
M javascripts/modules/uploads/PhotoUploadProgress.js
2 files changed, 38 insertions(+), 14 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/uploads/PhotoUploadOverlay.js
b/javascripts/modules/uploads/PhotoUploadOverlay.js
index f4566a1..dc93486 100644
--- a/javascripts/modules/uploads/PhotoUploadOverlay.js
+++ b/javascripts/modules/uploads/PhotoUploadOverlay.js
@@ -45,6 +45,14 @@
msg: mw.msg( 'mobile-frontend-photo-submit' )
} ]
},
+ /** @inheritdoc */
+ events: $.extend( {}, Overlay.prototype.events, {
+ 'click .submit': 'onSubmit',
+ 'keyup textarea': 'onDescriptionChange',
+ // use input event too, Firefox doesn't fire keyup on
many devices:
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=737658
+ 'input textarea': 'onDescriptionChange'
+ } ),
className: 'overlay photo-overlay',
@@ -218,20 +226,9 @@
Overlay.prototype.postRender.apply( this, arguments );
$submitButton = this.$( '.submit' )
- .prop( 'disabled', true )
- .on( 'click', function () {
- self.schema.log( {
- action: 'previewSubmit'
- } );
- self._submit();
- } );
+ .prop( 'disabled', true );
this.$description = this.$( 'textarea' )
- .microAutosize()
- // use input event too, Firefox doesn't fire
keyup on many devices:
- //
https://bugzilla.mozilla.org/show_bug.cgi?id=737658
- .on( 'keyup input', function () {
- $submitButton.prop( 'disabled',
self.$description.val() === '' );
- } );
+ .microAutosize();
// make license links open in separate tabs
this.$( '.license a' ).attr( 'target', '_blank' );
@@ -315,6 +312,23 @@
popup.show( mw.msg(
'mobile-frontend-photo-upload-error-file-type' ), 'toast error' );
self.hide( true );
} );
+ },
+
+ /**
+ * event handler to submit
+ */
+ onSubmit: function () {
+ this.schema.log( {
+ action: 'previewSubmit'
+ } );
+ this._submit();
+ },
+
+ /**
+ * event handler for changing description of property
+ */
+ onDescriptionChange: function () {
+ this.$( '.submit' ).prop( 'disabled', this.$(
'textarea' ).val() === '' );
}
} );
diff --git a/javascripts/modules/uploads/PhotoUploadProgress.js
b/javascripts/modules/uploads/PhotoUploadProgress.js
index cbc4547..63990fe 100644
--- a/javascripts/modules/uploads/PhotoUploadProgress.js
+++ b/javascripts/modules/uploads/PhotoUploadProgress.js
@@ -22,6 +22,10 @@
defaults: $.extend( {}, Overlay.prototype.defaults, {
uploadingMsg: mw.msg( 'mobile-frontend-image-uploading'
)
} ),
+ /** @inheritdoc */
+ events: $.extend( {}, Overlay.prototype.events, {
+ 'click .submit': 'onSubmit'
+ } ),
template: mw.template.get( 'mobile.uploads',
'PhotoUploadProgress.hogan' ),
fullScreen: false,
@@ -34,7 +38,6 @@
/** @inheritdoc */
postRender: function () {
Overlay.prototype.postRender.apply( this, arguments );
- this.$( '.submit' ).on( 'click', $.proxy( this, 'emit',
'submit' ) );
},
/**
@@ -77,6 +80,13 @@
this.$( '.right' ).remove();
}
this.progressBar.setValue( value );
+ },
+
+ /**
+ * event handler to submit
+ */
+ onSubmit: function () {
+ this.emit( 'submit' );
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/196609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4004187ab3454a3976d5b84a57576156e78af935
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Sumit <asthana.sumi...@gmail.com>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
