jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347903 )
Change subject: mw.widgets.Complex*: Fix setDisabled
......................................................................
mw.widgets.Complex*: Fix setDisabled
* Check if elements exists before trying to disable them
* Return `this`, as the method is marked as chainable
Follows-up I6747f4e64dd81197bb3e37c09876399f1cb3be07
Bug: T162667
Change-Id: I17665e57537dbed0821bc3226377849eb8388a32
---
M resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
M resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
2 files changed, 12 insertions(+), 4 deletions(-)
Approvals:
Fomafix: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
index b0c9f91..9edd0bd 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
@@ -120,8 +120,9 @@
*/
mw.widgets.ComplexNamespaceInputWidget.prototype.setDisabled = function
( disabled ) {
mw.widgets.ComplexNamespaceInputWidget.parent.prototype.setDisabled.call( this,
disabled );
- this.namespace.setDisabled( disabled );
-
+ if ( this.namespace ) {
+ this.namespace.setDisabled( disabled );
+ }
if ( this.invert ) {
this.invert.setDisabled( disabled );
}
@@ -129,6 +130,7 @@
if ( this.associated ) {
this.associated.setDisabled( disabled );
}
+ return this;
};
}( jQuery, mediaWiki ) );
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
index 030fbb0..a01fbde 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
@@ -108,8 +108,14 @@
*/
mw.widgets.ComplexTitleInputWidget.prototype.setDisabled = function (
disabled ) {
mw.widgets.ComplexTitleInputWidget.parent.prototype.setDisabled.call( this,
disabled );
- this.namespace.setDisabled( disabled );
- this.title.setDisabled( disabled );
+ if ( this.namespace ) {
+ this.namespace.setDisabled( disabled );
+ }
+
+ if ( this.title ) {
+ this.title.setDisabled( disabled );
+ }
+ return this;
};
}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/347903
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I17665e57537dbed0821bc3226377849eb8388a32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
Gerrit-Reviewer: Fomafix <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
