Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196973
Change subject: Rename popups.eventLogging to popups.logger
......................................................................
Rename popups.eventLogging to popups.logger
Change-Id: I04f9b7b61d1b854d7f176e8a4b76da064c7030a4
---
M Popups.hooks.php
M resources/ext.popups.core.js
R resources/ext.popups.logger.js
M resources/ext.popups.renderer.js
4 files changed, 38 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/73/196973/1
diff --git a/Popups.hooks.php b/Popups.hooks.php
index 649b71a..1f01753 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.core.js b/resources/ext.popups.core.js
index 4187938..c09c406 100644
--- a/resources/ext.popups.core.js
+++ b/resources/ext.popups.core.js
@@ -172,7 +172,7 @@
mw.popups.setupTriggers( $elements );
} else {
$elements.on( 'click', function () {
- mw.popups.eventLogging.logLinkClick( event, $(
this ) );
+ mw.popups.logger.logLinkClick( event, $( this )
);
} );
}
} );
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 1bf9fab..5fcb96e 100644
--- a/resources/ext.popups.eventlogging.js
+++ b/resources/ext.popups.logger.js
@@ -1,40 +1,40 @@
( function ( $, mw ) {
/**
- * @class mw.popups.eventLogging
+ * @class mw.popups.logger
* @singleton
*/
- var eventLogging = {};
+ var logger = {};
/**
* One in how many requests to log
* @property samplingRate
*/
- eventLogging.samplingRate = 1;
+ logger.samplingRate = 1;
/**
* 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;
/**
* The title corresponding to the link on which Hovercard was triggered
on
* @property {String} pageTitleHover
*/
- eventLogging.pageTitleHover = undefined;
+ logger.pageTitleHover = undefined;
/**
* Whether or not to log the event given a sampling rate
@@ -43,7 +43,7 @@
* @param {Number} rate
* @return {Boolean} Whether or not to log
*/
- eventLogging.oneInA = function ( rate ) {
+ logger.oneInA = function ( rate ) {
if ( !$.isNumeric( rate ) ) {
return false;
}
@@ -58,7 +58,7 @@
* @param {jQuery.event} event
* return {String}
*/
- eventLogging.getAction = function ( event ) {
+ logger.getAction = function ( event ) {
if ( event.which === 2 ) { // middle click
return 'opened in new tab';
} else if ( event.which === 1 ) {
@@ -79,11 +79,11 @@
* @method logClick
* @param {Object} event
*/
- eventLogging.logClick = function ( event ) {
- eventLogging.action = eventLogging.getAction ( event );
- if ( eventLogging.action === 'opened in same tab' ) {
- eventLogging.duration = mw.now() - eventLogging.time;
- eventLogging.logEvent(
mw.popups.render.currentLink.attr( 'href' ) );
+ logger.logClick = function ( event ) {
+ logger.action = logger.getAction ( event );
+ if ( logger.action === 'opened in same tab' ) {
+ logger.duration = mw.now() - logger.time;
+ logger.log( mw.popups.render.currentLink.attr( 'href' )
);
event.preventDefault();
}
};
@@ -95,17 +95,17 @@
* @param {jQuery.event} event
* @param {jQuery} $el
*/
- eventLogging.logLinkClick = function ( event, $el ) {
+ logger.logLinkClick = function ( event, $el ) {
var href;
- eventLogging.action = eventLogging.getAction ( event );
- eventLogging.pageTitleHover = $el.attr( 'title' );
+ logger.action = logger.getAction ( event );
+ logger.pageTitleHover = $el.attr( 'title' );
- if ( eventLogging.action === 'opened in same tab' ) {
+ if ( logger.action === 'opened in same tab' ) {
href = $el.attr( 'href' );
event.preventDefault();
}
- eventLogging.logEvent( href );
+ logger.log( href );
};
/**
@@ -113,28 +113,28 @@
* 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
*/
- eventLogging.logEvent = function ( href ) {
+ logger.log = function ( href ) {
if ( mw.eventLog === undefined ) {
return false;
}
var event = {
- 'action': eventLogging.action,
+ 'action': logger.action,
'popupEnabled': mw.popups.enabled,
'popupDelay': mw.popups.render.POPUP_DELAY,
'pageTitleSource': mw.config.get( 'wgTitle' ),
- 'pageTitleHover': eventLogging.pageTitleHover,
+ 'pageTitleHover': logger.pageTitleHover,
};
if ( mw.popups.enabled ) {
event.popupDelay = mw.popups.render.POPUP_DELAY;
- event.duration = Math.round( eventLogging.duration );
+ event.duration = Math.round( logger.duration );
}
- if ( eventLogging.oneInA( eventLogging.samplingRate ) ) {
+ if ( logger.oneInA( logger.samplingRate ) ) {
mw.eventLog.logEvent( 'Popups', event );
}
@@ -143,12 +143,12 @@
}
// reset
- eventLogging.time = undefined;
- eventLogging.duration = undefined;
- eventLogging.action = undefined;
- eventLogging.pageTitleHover = undefined;
+ logger.time = undefined;
+ logger.duration = undefined;
+ logger.action = undefined;
+ logger.pageTitleHover = undefined;
};
- 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 04b02bb..f726abb 100644
--- a/resources/ext.popups.renderer.js
+++ b/resources/ext.popups.renderer.js
@@ -153,10 +153,10 @@
cache.process( link );
// Event logging
- mw.popups.eventLogging.pageTitleHover = cache.settings.title;
- 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.pageTitleHover = cache.settings.title;
+ 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
)
@@ -176,8 +176,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/196973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04f9b7b61d1b854d7f176e8a4b76da064c7030a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
