jenkins-bot has submitted this change and it was merged.
Change subject: Ignore defineProperty() failures in mw.log.deprecate
......................................................................
Ignore defineProperty() failures in mw.log.deprecate
This reverts 159dbdc06f214f3fed3f86808312012cf2099e4f.
Bug: T145570
Change-Id: I9ed4cf7b379116f33cfcaee3de053739f9b25b7e
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 24 insertions(+), 18 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 3122d42..780dac7 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -489,25 +489,31 @@
logged.add( trace );
return true;
}
- Object.defineProperty( obj, key, {
- configurable: true,
- enumerable: true,
- get: function () {
- if ( uniqueTrace() ) {
- mw.track( 'mw.deprecate', key );
- mw.log.warn( msg );
+ // Support: Safari 5.0
+ // Throws "not supported on DOM Objects" for Node or
Element objects (incl. document)
+ // Safari 4.0 doesn't have this method, and it was
fixed in Safari 5.1.
+ try {
+ Object.defineProperty( obj, key, {
+ configurable: true,
+ enumerable: true,
+ get: function () {
+ if ( uniqueTrace() ) {
+ mw.track(
'mw.deprecate', key );
+ mw.log.warn( msg );
+ }
+ return val;
+ },
+ set: function ( newVal ) {
+ if ( uniqueTrace() ) {
+ mw.track(
'mw.deprecate', key );
+ mw.log.warn( msg );
+ }
+ val = newVal;
}
- return val;
- },
- set: function ( newVal ) {
- if ( uniqueTrace() ) {
- mw.track( 'mw.deprecate', key );
- mw.log.warn( msg );
- }
- val = newVal;
- }
- } );
-
+ } );
+ } catch ( err ) {
+ obj[ key ] = val;
+ }
};
return log;
--
To view, visit https://gerrit.wikimedia.org/r/313602
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ed4cf7b379116f33cfcaee3de053739f9b25b7e
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
