jenkins-bot has submitted this change and it was merged.
Change subject: Revert "mediawiki.log: Do not dynamically redefine
mw.log.deprecate"
......................................................................
Revert "mediawiki.log: Do not dynamically redefine mw.log.deprecate"
This reverts commit d1e99dd5b20b44ccc3737025501cb81670885dea.
Change-Id: I4f3ef65e63f7865da64b2efa0c5b2951e5930415
---
M resources/mediawiki/mediawiki.log.js
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mediawiki/mediawiki.log.js
b/resources/mediawiki/mediawiki.log.js
index 20d0832..75e4c96 100644
--- a/resources/mediawiki/mediawiki.log.js
+++ b/resources/mediawiki/mediawiki.log.js
@@ -94,14 +94,14 @@
* Create a property in a host object that, when accessed, will produce
* a deprecation warning in the console with backtrace.
*
- * If Object.defineProperty is missing, equivalent to `obj[key] = val`.
- *
* @param {Object} obj Host object of deprecated property
* @param {string} key Name of property to create in `obj`
* @param {Mixed} val The value this property should return when
accessed
* @param {string} [msg] Optional text to include in the deprecation
message.
*/
- mw.log.deprecate = function ( obj, key, val, msg ) {
+ mw.log.deprecate = !Object.defineProperty ? function ( obj, key, val ) {
+ obj[key] = val;
+ } : function ( obj, key, val, msg ) {
msg = 'MWDeprecationWarning: Use of "' + key + '" property is
deprecated.' +
( msg ? ( ' ' + msg ) : '' );
try {
@@ -118,7 +118,7 @@
}
} );
} catch ( err ) {
- // Object.defineProperty missing or the call threw an
error (it can do it on IE8)
+ // IE8 can throw on Object.defineProperty
obj[key] = val;
}
};
--
To view, visit https://gerrit.wikimedia.org/r/92467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f3ef65e63f7865da64b2efa0c5b2951e5930415
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_22
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
