wikimedia/mediawiki-extensions-MultimediaViewer
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer synced 2024-09-25 03:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix painful bug in eventlogging code"

Browse source
This commit is contained in:
jenkins-bot 2014-01-08 17:18:28 +00:00 committed by Gerrit Code Review
parent 4c87c93d91 3547f17960
commit 65db71572c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/ext.multimediaViewer/ext.multimediaViewer.js
View file

@ -907,20 +907,20 @@
* Signal the end of an event being profiled and send the
* eventlogging message.
* @param {number} id Should be the value returned from profileStart
* @param {boolean} [includeTime] For testing, whether to include the time in the message. Time is zero otherwise.
* @param {boolean} [fakeTime] For testing, whether to fake the time in the message. Time is zero if so.
*/
MMVP.profileEnd = function ( id, includeTime ) {
MMVP.profileEnd = function ( id, fakeTime ) {
var msg;
if ( profiling[id] ) {
msg = profiling[id];
msg.milliseconds = includeTime ? Date.now() - msg.start : 0;
msg.milliseconds = Date.now() - msg.start;
delete msg.start;
mw.log(
mmvLogActions['profile-' + msg.action + '-end']
.replace( /\$1/g, id )
.replace( /\$2/g, msg.milliseconds )
.replace( /\$2/g, fakeTime ? 0 : msg.milliseconds )
);
if ( mw.eventLog ) {

2
tests/qunit/ext.multimediaViewer.test.js
View file

@ -208,7 +208,7 @@
assert.strictEqual( pid, i, 'nonce-style profile IDs come in order.' );
expectedMsg = test[2].replace( /\$1/g, i ).replace( /\$2/g, 0 );
viewer.profileEnd( pid, false );
viewer.profileEnd( pid, true );
}
mw.log = backupLog;