jenkins-bot has submitted this change and it was merged.
Change subject: Don't try to log metrics if it's not an image
......................................................................
Don't try to log metrics if it's not an image
Bug: 71780
Change-Id: Id47f9cdc35ce03350353d27f40af8e059d4abd9e
---
M resources/ext.imageMetrics.js
M tests/qunit/ext.imageMetrics.test.js
2 files changed, 17 insertions(+), 0 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.imageMetrics.js b/resources/ext.imageMetrics.js
index ffebc8f..b68e718 100644
--- a/resources/ext.imageMetrics.js
+++ b/resources/ext.imageMetrics.js
@@ -162,6 +162,10 @@
data.imageType = 'filepage-main'; // the only supported
measurement type ATM
$file = $( '#file' ).find( 'img' ); // more efficient than
'#file img'
+ if ( !$file.length ) {
+ return;
+ }
+
this.addMediaWikiData( data, $file );
this.addOnloadData( data );
this.addNavigationTimingData( data );
diff --git a/tests/qunit/ext.imageMetrics.test.js
b/tests/qunit/ext.imageMetrics.test.js
index e992ecb..cfe3538 100644
--- a/tests/qunit/ext.imageMetrics.test.js
+++ b/tests/qunit/ext.imageMetrics.test.js
@@ -103,4 +103,17 @@
assert.strictEqual( data.fullLoadingTime, 10222,
'fullLoadingTime is logged correctly' );
assert.strictEqual( data.fetchDelay, 89, 'fetchDelay is logged
correctly' );
} );
+
+ QUnit.test( 'No image, no logging', 1, function ( assert ) {
+ var options = {
+ performance: { navigation: { type: 0 } },
+ config: { wgImageMetricsSamplingFactor: 1 }
+ },
+ imageMetrics = createImageMetrics( this.sandbox,
options );
+ $( '#qunit-fixture' ).append( '<div id="file"></div>' );
+
+ imageMetrics.log();
+
+ assert.strictEqual( options.logEvent.called, false, 'logEvent
was not called' );
+ } );
} ( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/165441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id47f9cdc35ce03350353d27f40af8e059d4abd9e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ImageMetrics
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
