jenkins-bot has submitted this change and it was merged.
Change subject: Rename popups.eventLogging to popups.logger
......................................................................
Rename popups.eventLogging to popups.logger
...and eventLogging.logEvent to logger.log
Change-Id: I9af697a56c2248069a32ac586f5b78b55095460e
---
M Popups.hooks.php
R resources/ext.popups.logger.js
M resources/ext.popups.renderer.js
3 files changed, 30 insertions(+), 30 deletions(-)
Approvals:
Werdna: Looks good to me, approved
Nuria: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Popups.hooks.php b/Popups.hooks.php
index 5880f34..4944c8c 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -67,7 +67,7 @@
$rl->register( "ext.popups", array(
'scripts' => array(
'resources/ext.popups.core.js',
- 'resources/ext.popups.eventlogging.js',
+ 'resources/ext.popups.logger.js',
'resources/ext.popups.renderer.js',
'resources/ext.popups.renderer.article.js',
'resources/ext.popups.disablenavpop.js',
diff --git a/resources/ext.popups.eventlogging.js
b/resources/ext.popups.logger.js
similarity index 63%
rename from resources/ext.popups.eventlogging.js
rename to resources/ext.popups.logger.js
index 8690ca7..b3d10b4 100644
--- a/resources/ext.popups.eventlogging.js
+++ b/resources/ext.popups.logger.js
@@ -1,28 +1,28 @@
( function ( $, mw ) {
/**
- * @class mw.popups.eventLogging
+ * @class mw.popups.logger
* @singleton
*/
- var eventLogging = {};
+ var logger = {};
/**
* Unix timestamp of when the popup was rendered
* @property time
*/
- eventLogging.time = undefined;
+ logger.time = undefined;
/**
* How long was the popup open in milliseconds
* @property {Number} duration
*/
- eventLogging.duration = undefined;
+ logger.duration = undefined;
/**
* Was the popup clicked, middle clicked or dismissed
* @property {String} action
*/
- eventLogging.action = undefined;
+ logger.action = undefined;
/**
* Logs different actions such as meta and shift click on the popup
@@ -31,18 +31,18 @@
* @method logClick
* @param {Object} event
*/
- eventLogging.logClick = function ( event ) {
+ logger.logClick = function ( event ) {
if ( event.which === 2 ) { // middle click
- eventLogging.action = 'opened in new tab';
+ logger.action = 'opened in new tab';
} else if ( event.which === 1 ) {
if ( event.ctrlKey || event.metaKey ) {
- eventLogging.action = 'opened in new tab';
+ logger.action = 'opened in new tab';
} else if ( event.shiftKey ) {
- eventLogging.action = 'opened in new window';
+ logger.action = 'opened in new window';
} else {
- eventLogging.action = 'opened in same tab';
- eventLogging.duration = mw.now() -
eventLogging.time;
- eventLogging.logEvent(
mw.popups.render.currentLink.attr( 'href' ) );
+ logger.action = 'opened in same tab';
+ logger.duration = mw.now() - logger.time;
+ logger.log( mw.popups.render.currentLink.attr(
'href' ) );
event.preventDefault();
}
}
@@ -53,11 +53,11 @@
* https://meta.wikimedia.org/wiki/Schema:Popups
* If `href` is passed it redirects to that location after the event is
logged.
*
- * @method logEvent
+ * @method log
* @param {String} href
* @return {Boolean} logged Whether or not the event was logged
*/
- eventLogging.logEvent = function ( href ) {
+ logger.log = function ( href ) {
if ( mw.eventLog === undefined ) {
return false;
}
@@ -65,12 +65,12 @@
var
deferred = $.Deferred(),
event = {
- 'duration': Math.round( eventLogging.duration ),
- 'action': eventLogging.action
+ 'duration': Math.round( logger.duration ),
+ 'action': logger.action
};
- if ( eventLogging.sessionId !== null ) {
- event.sessionId = eventLogging.sessionId;
+ if ( logger.sessionId !== null ) {
+ event.sessionId = logger.sessionId;
}
if ( href ) {
@@ -82,9 +82,9 @@
mw.eventLog.logEvent( 'Popups', event ).then( deferred.resolve,
deferred.reject );
// reset
- eventLogging.time = undefined;
- eventLogging.duration = undefined;
- eventLogging.action = undefined;
+ logger.time = undefined;
+ logger.duration = undefined;
+ logger.action = undefined;
return true;
};
@@ -95,7 +95,7 @@
* @method getSessionsId
* @return {String} sessionId
*/
- eventLogging.getSessionId = function () {
+ logger.getSessionId = function () {
var sessionId = null;
try {
sessionId = localStorage.getItem( 'popupsSessionId' );
@@ -110,8 +110,8 @@
/**
* @property sessionId
*/
- eventLogging.sessionId = eventLogging.getSessionId();
+ logger.sessionId = logger.getSessionId();
- mw.popups.eventLogging = eventLogging;
+ mw.popups.logger = logger;
} ) ( jQuery, mediaWiki );
diff --git a/resources/ext.popups.renderer.js b/resources/ext.popups.renderer.js
index 0781ad2..c125fab 100644
--- a/resources/ext.popups.renderer.js
+++ b/resources/ext.popups.renderer.js
@@ -153,9 +153,9 @@
cache.process( link );
// Event logging
- mw.popups.eventLogging.time = mw.now();
- mw.popups.eventLogging.action = 'dismissed';
- mw.popups.$popup.find( 'a.mwe-popups-extract,
a.mwe-popups-discreet' ).click( mw.popups.eventLogging.logClick );
+ mw.popups.logger.time = mw.now();
+ mw.popups.logger.action = 'dismissed';
+ mw.popups.$popup.find( 'a.mwe-popups-extract,
a.mwe-popups-discreet' ).click( mw.popups.logger.logClick );
link
.off( 'mouseleave blur', mw.popups.render.leaveInactive
)
@@ -175,8 +175,8 @@
return false;
}
- mw.popups.eventLogging.duration = mw.now() -
mw.popups.eventLogging.time;
- mw.popups.eventLogging.logEvent();
+ mw.popups.logger.duration = mw.now() - mw.popups.logger.time;
+ mw.popups.logger.log();
$( mw.popups.render.currentLink ).off( 'mouseleave blur',
mw.popups.render.leaveActive );
--
To view, visit https://gerrit.wikimedia.org/r/198188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9af697a56c2248069a32ac586f5b78b55095460e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
Gerrit-Reviewer: Nuria <[email protected]>
Gerrit-Reviewer: Prtksxna <[email protected]>
Gerrit-Reviewer: Werdna <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
