Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/315585
Change subject: Wait and reset do not need to be exposed globally ...................................................................... Wait and reset do not need to be exposed globally Bug: T147306 Change-Id: I506b12f00ec6ea08512eb1a877e6d0b6d5fb2813 --- M resources/ext.popups.renderer/desktopRenderer.js 1 file changed, 13 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups refs/changes/85/315585/1 diff --git a/resources/ext.popups.renderer/desktopRenderer.js b/resources/ext.popups.renderer/desktopRenderer.js index 0907d3e..50378e4 100644 --- a/resources/ext.popups.renderer/desktopRenderer.js +++ b/resources/ext.popups.renderer/desktopRenderer.js @@ -153,13 +153,13 @@ .on( 'click', clickHandler ); if ( mw.popups.render.cache[ $link.attr( 'href' ) ] ) { - openTimer = mw.popups.render.wait( mw.popups.render.POPUP_DELAY ) + openTimer = wait( mw.popups.render.POPUP_DELAY ) .done( function () { mw.popups.render.openPopup( $link, event ); } ); } else { // Wait for timer before making API queries and showing hovercard - openTimer = mw.popups.render.wait( mw.popups.render.API_DELAY ) + openTimer = wait( mw.popups.render.API_DELAY ) .done( function () { var cachePopup, key, renderers = mw.popups.render.renderers; @@ -178,7 +178,7 @@ cachePopup = mw.popups.render.renderers.article.init( $link, $.extend( {}, logData ) ); } - openTimer = mw.popups.render.wait( mw.popups.render.POPUP_DELAY - mw.popups.render.API_DELAY ); + openTimer = wait( mw.popups.render.POPUP_DELAY - mw.popups.render.API_DELAY ); $.when( openTimer, cachePopup ).done( function () { mw.popups.render.openPopup( $link, event ); @@ -291,7 +291,7 @@ .removeClass( fadeInClass ) .addClass( fadeOutClass ); - mw.popups.render.wait( 150 ).done( function () { + wait( 150 ).done( function () { if ( mw.popups.$popup.hasClass( fadeOutClass ) ) { mw.popups.$popup .attr( 'aria-hidden', 'true' ) @@ -310,7 +310,7 @@ logCallback(); } - mw.popups.render.reset(); + reset(); }; /** @@ -318,10 +318,11 @@ * to perform the equivalent of `clearTimeout()` * * @method wait + * @ignore * @param {number} ms Milliseconds to wait * @return {jQuery.Promise} */ - mw.popups.render.wait = function ( ms ) { + function wait ( ms ) { var deferred, promise, timeout; deferred = $.Deferred(); @@ -336,7 +337,7 @@ } } ); return promise; - }; + } /** * Use escape to close popup @@ -361,7 +362,7 @@ * @ignore */ function leaveActive() { - closeTimer = mw.popups.render.wait( mw.popups.render.POPUP_CLOSE_DELAY ).done( function () { + closeTimer = wait( mw.popups.render.POPUP_CLOSE_DELAY ).done( function () { var $activeLink = getActiveLink(); if ( $activeLink ) { mw.popups.render.closePopup( logDismissAction ); @@ -394,20 +395,21 @@ } mw.popups.render.abortCurrentRequest(); - mw.popups.render.reset(); + reset(); } /** * Resets the renderer * * @method reset + * @ignore */ - mw.popups.render.reset = function () { + function reset() { logData = {}; setActiveLink( null ); mw.popups.render.abortCurrentRequest(); openTimer = undefined; closeTimer = undefined; - }; + } } )( jQuery, mediaWiki ); -- To view, visit https://gerrit.wikimedia.org/r/315585 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I506b12f00ec6ea08512eb1a877e6d0b6d5fb2813 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits