[MediaWiki-commits] [Gerrit] Rename popups.eventLogging to popups.logger - change (mediawiki...Popups)
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 ) {
-
[MediaWiki-commits] [Gerrit] Rename popups.eventLogging to popups.logger - change (mediawiki...Popups)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198188
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(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/88/198188/1
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 ) {
-
[MediaWiki-commits] [Gerrit] Rename popups.eventLogging to popups.logger - change (mediawiki...Popups)
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
