[MediaWiki-commits] [Gerrit] Fix event logging issues - change (mediawiki...Popups)

[Werdna (Code Review)]

Werdna has submitted this change and it was merged.

Change subject: Fix event logging issues
......................................................................


Fix event logging issues

- Don't prevent the link click event.
- Check with the currentLink element rather than jQuery selectoin.
- Add click handler to images (used to be only extract).
- Stop the 'closePopup' if 'reset' has already been run.

Bug: T86378
Change-Id: I8748ecffe55954425656c5103fa9ddc99b6f3f72
---
M resources/ext.popups.eventlogging.js
M resources/ext.popups.renderer.js
2 files changed, 13 insertions(+), 4 deletions(-)

Approvals:
  Werdna: Looks good to me, approved



diff --git a/resources/ext.popups.eventlogging.js 
b/resources/ext.popups.eventlogging.js
index 3e7b183..05e4f33 100644
--- a/resources/ext.popups.eventlogging.js
+++ b/resources/ext.popups.eventlogging.js
@@ -46,7 +46,6 @@
                                event.preventDefault();
                        }
                }
-               return false;
        };
 
        /**
diff --git a/resources/ext.popups.renderer.js b/resources/ext.popups.renderer.js
index ed45ed0..3d17c5f 100644
--- a/resources/ext.popups.renderer.js
+++ b/resources/ext.popups.renderer.js
@@ -65,8 +65,13 @@
        mw.popups.render.render = function ( link, event ) {
                // This will happen when the mouse goes from the popup box back 
to the
                // anchor tag. In such a case, the timer to close the box is 
cleared.
-               if ( mw.popups.render.currentLink === link ) {
-                       mw.popups.render.closeTimer.abort();
+               if (
+                       mw.popups.render.currentLink &&
+                       mw.popups.render.currentLink[0] === link[0]
+               ) {
+                       if ( mw.popups.render.closeTimer ) {
+                               mw.popups.render.closeTimer.abort();
+                       }
                        return;
                }
 
@@ -81,6 +86,7 @@
                if ( link.attr( 'href' ) === '#' ) {
                        return;
                }
+
 
                mw.popups.render.currentLink = link;
                link.on( 'mouseleave blur', mw.popups.render.leaveInactive );
@@ -147,7 +153,7 @@
                // Event logging
                mw.popups.eventLogging.time = mw.now();
                mw.popups.eventLogging.action = 'dismissed';
-               mw.popups.$popup.find( 'a.mwe-popups-extract' ).click( 
mw.popups.eventLogging.logClick );
+               mw.popups.$popup.find( 'a.mwe-popups-extract, 
a.mwe-popups-discreet' ).click( mw.popups.eventLogging.logClick );
 
                link
                        .off( 'mouseleave blur', mw.popups.render.leaveInactive 
)
@@ -163,6 +169,10 @@
         * @method closePopup
         */
        mw.popups.render.closePopup = function () {
+               if ( mw.popups.render.currentLink === undefined ) {
+                       return false;
+               }
+
                mw.popups.eventLogging.duration = mw.now() - 
mw.popups.eventLogging.time;
                mw.popups.eventLogging.logEvent();
 

-- 
To view, visit https://gerrit.wikimedia.org/r/184626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8748ecffe55954425656c5103fa9ddc99b6f3f72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <psax...@wikimedia.org>
Gerrit-Reviewer: AndyRussG <andrew.green...@gmail.com>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Werdna <agarr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits