jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.inspect: use $.toJSON & add workaround for FF oddity
......................................................................
mediawiki.inspect: use $.toJSON & add workaround for FF oddity
* Use $.toJSON rather than JSON.stringify. Make mediawiki.inspect depend on
jquery.json.
* Firefox doesn't define a console.table, but doesn't throw an exception either
if you attempt to invoke it. Use Function.prototype#call to call Firefox's
bluff.
Change-Id: Ib45487d10488f08a98d9635ab9a2a9212e9ef69f
---
M resources/Resources.php
M resources/mediawiki/mediawiki.inspect.js
2 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/Resources.php b/resources/Resources.php
index c033647..2c02de8 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -655,7 +655,10 @@
),
'mediawiki.inspect' => array(
'scripts' => 'resources/mediawiki/mediawiki.inspect.js',
- 'dependencies' => 'jquery.byteLength',
+ 'dependencies' => array(
+ 'jquery.byteLength',
+ 'jquery.json',
+ ),
'targets' => array( 'desktop', 'mobile' ),
),
'mediawiki.feedback' => array(
diff --git a/resources/mediawiki/mediawiki.inspect.js
b/resources/mediawiki/mediawiki.inspect.js
index 8268f12..c895adf 100644
--- a/resources/mediawiki/mediawiki.inspect.js
+++ b/resources/mediawiki/mediawiki.inspect.js
@@ -101,11 +101,14 @@
try {
// Bartosz made me put this here.
if ( window.opera ) { throw window.opera; }
- console.table( data );
+ // Use Function.prototype#call to force an
exception on Firefox,
+ // which doesn't define console#table but
doesn't complain if you
+ // try to invoke it.
+ console.table.call( console.table, data );
return;
} catch (e) {}
try {
- console.log( JSON.stringify( data, null, 2 ) );
+ console.log( $.toJSON( data, null, 2 ) );
return;
} catch (e) {}
mw.log( data );
--
To view, visit https://gerrit.wikimedia.org/r/91543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib45487d10488f08a98d9635ab9a2a9212e9ef69f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
