jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Only allow calls to closePopup on an active link
......................................................................
Hygiene: Only allow calls to closePopup on an active link
Change-Id: I7c15870e1586aa8629af723accad67dee5483369
---
M resources/ext.popups.renderer/desktopRenderer.js
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.popups.renderer/desktopRenderer.js
b/resources/ext.popups.renderer/desktopRenderer.js
index 0633122..53849bb 100644
--- a/resources/ext.popups.renderer/desktopRenderer.js
+++ b/resources/ext.popups.renderer/desktopRenderer.js
@@ -260,10 +260,6 @@
var fadeInClass, fadeOutClass,
$activeLink = getActiveLink();
- if ( !$activeLink ) {
- return false;
- }
-
$activeLink.off( 'mouseleave blur',
mw.popups.render.leaveActive );
fadeInClass = ( mw.popups.$popup.hasClass(
'mwe-popups-fade-in-up' ) ) ?
@@ -332,7 +328,8 @@
* @method closeOnEsc
*/
mw.popups.render.closeOnEsc = function ( event ) {
- if ( event.keyCode === 27 ) {
+ var $activeLink = getActiveLink();
+ if ( event.keyCode === 27 && $activeLink ) {
mw.popups.render.closePopup();
}
};
@@ -346,7 +343,10 @@
*/
mw.popups.render.leaveActive = function () {
closeTimer = mw.popups.render.wait(
mw.popups.render.POPUP_CLOSE_DELAY ).done( function () {
- mw.popups.render.closePopup();
+ var $activeLink = getActiveLink();
+ if ( $activeLink ) {
+ mw.popups.render.closePopup();
+ }
} );
};
--
To view, visit https://gerrit.wikimedia.org/r/312427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7c15870e1586aa8629af723accad67dee5483369
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
