Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198190
Change subject: Implement the new schema for when the popups are enabled
......................................................................
Implement the new schema for when the popups are enabled
Bug: T88167
Change-Id: I38c9e474e0ec7da45af8338a458430e5d7427463
---
M Popups.hooks.php
M resources/ext.popups.logger.js
M resources/ext.popups.renderer.article.js
M resources/ext.popups.renderer.js
4 files changed, 15 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/90/198190/1
diff --git a/Popups.hooks.php b/Popups.hooks.php
index 4944c8c..ed7a5b0 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -42,7 +42,7 @@
* @param array $schemas
*/
public static function onEventLoggingRegisterSchemas( array &$schemas )
{
- $schemas['Popups'] = 7536956;
+ $schemas['Popups'] = 11625443;
}
/**
diff --git a/resources/ext.popups.logger.js b/resources/ext.popups.logger.js
index 602f4dd..03b75ba 100644
--- a/resources/ext.popups.logger.js
+++ b/resources/ext.popups.logger.js
@@ -25,6 +25,12 @@
logger.action = undefined;
/**
+ * The title corresponding to the link on which Hovercard was triggered
on
+ * @property {String} pageTitleHover
+ */
+ logger.pageTitleHover = undefined;
+
+ /**
* Get action based on click event
*
* @method getAction
@@ -87,12 +93,12 @@
logger.getEventObject = function () {
var event = {
'duration': Math.round( logger.duration ),
- 'action': logger.action
+ 'action': logger.action,
+ 'popupEnabled': mw.popups.enabled,
+ 'popupDelay': mw.popups.render.POPUP_DELAY,
+ 'pageTitleSource': mw.config.get( 'wgTitle' ),
+ 'pageTitleHover': logger.pageTitleHover
};
-
- if ( logger.sessionId !== null ) {
- event.sessionId = logger.sessionId;
- }
logger.reset();
return event;
@@ -107,30 +113,8 @@
logger.time = undefined;
logger.duration = undefined;
logger.action = undefined;
+ logger.pageTitleHover = undefined;
}
-
- /**
- * Generates a unique sessionId or pulls an existing one from
localStorage
- *
- * @method getSessionsId
- * @return {String} sessionId
- */
- logger.getSessionId = function () {
- var sessionId = null;
- try {
- sessionId = localStorage.getItem( 'popupsSessionId' );
- if ( sessionId === null ) {
- sessionId = mw.user.generateRandomSessionId();
- localStorage.setItem( 'popupsSessionId',
sessionId );
- }
- } catch ( e ) {}
- return sessionId;
- };
-
- /**
- * @property sessionId
- */
- logger.sessionId = logger.getSessionId();
mw.popups.logger = logger;
diff --git a/resources/ext.popups.renderer.article.js
b/resources/ext.popups.renderer.article.js
index 728606b..5bcc0db 100644
--- a/resources/ext.popups.renderer.article.js
+++ b/resources/ext.popups.renderer.article.js
@@ -133,6 +133,7 @@
$div = $( '<div>' ).append( $thumbnail, $contentbox, $timestamp
);
mw.popups.render.cache[ href ].settings = {
+ 'title': page.title,
'tall': ( tall === undefined ) ? false : tall,
'thumbnail': ( thumbnail === undefined ) ? false :
thumbnail
};
diff --git a/resources/ext.popups.renderer.js b/resources/ext.popups.renderer.js
index c125fab..f726abb 100644
--- a/resources/ext.popups.renderer.js
+++ b/resources/ext.popups.renderer.js
@@ -153,6 +153,7 @@
cache.process( link );
// Event logging
+ 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 );
--
To view, visit https://gerrit.wikimedia.org/r/198190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38c9e474e0ec7da45af8338a458430e5d7427463
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
