jenkins-bot has submitted this change and it was merged.
Change subject: Follow-up 9b582485: implement back compat for timeStamp
correctly
......................................................................
Follow-up 9b582485: implement back compat for timeStamp correctly
timeStamp was used in two places, but we only had back-compat
code in one, so the other ended up using NaN.
Bonus: make jshint happy with the indentation of the $.extend() call.
Change-Id: I69000d11822658f2a227f9756093bc278f5fbaf5
---
M modules/ve-mw/init/ve.init.mw.trackSubscriber.js
1 file changed, 16 insertions(+), 15 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
b/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
index c71c3e2..5474cdd 100644
--- a/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
+++ b/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
@@ -64,7 +64,8 @@
var action = topic.split( '.' )[1],
event;
- timing[action] = timeStamp || this.timeStamp; // I8e82acc12
back-compat
+ timeStamp = timeStamp || this.timeStamp; // I8e82acc12
back-compat
+ timing[action] = timeStamp;
if ( action === 'init' ) {
// Regenerate editingSessionId
@@ -72,20 +73,20 @@
}
event = $.extend( {
- version: 1,
- action: action,
- editor: 'visualeditor',
- platform: 'desktop', // FIXME
- integration: ve.init && ve.init.target &&
ve.init.target.constructor.static.integrationType || 'page',
- 'page.id': mw.config.get( 'wgArticleId' ),
- 'page.title': mw.config.get( 'wgPageName' ),
- 'page.ns': mw.config.get( 'wgNamespaceNumber' ),
- 'page.revid': mw.config.get( 'wgRevisionId' ),
- 'page.length': -1, // FIXME
- editingSessionId: editingSessionId,
- 'user.id': mw.user.getId(),
- 'user.editCount': mw.config.get(
'wgUserEditCount', 0 ),
- 'mediawiki.version': mw.config.get( 'wgVersion'
)
+ version: 1,
+ action: action,
+ editor: 'visualeditor',
+ platform: 'desktop', // FIXME
+ integration: ve.init && ve.init.target &&
ve.init.target.constructor.static.integrationType || 'page',
+ 'page.id': mw.config.get( 'wgArticleId' ),
+ 'page.title': mw.config.get( 'wgPageName' ),
+ 'page.ns': mw.config.get( 'wgNamespaceNumber' ),
+ 'page.revid': mw.config.get( 'wgRevisionId' ),
+ 'page.length': -1, // FIXME
+ editingSessionId: editingSessionId,
+ 'user.id': mw.user.getId(),
+ 'user.editCount': mw.config.get( 'wgUserEditCount', 0 ),
+ 'mediawiki.version': mw.config.get( 'wgVersion' )
}, data );
if ( mw.user.isAnon() ) {
--
To view, visit https://gerrit.wikimedia.org/r/192097
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69000d11822658f2a227f9756093bc278f5fbaf5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[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
