Bmansurov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/282196
Change subject: Remove the isElementInViewport function
......................................................................
Remove the isElementInViewport function
Use mw.viewport.isElementInViewport instead.
Bug: T124317
Change-Id: I621aa4c21d673d8d431bb38ba094271b570ca93c
---
M includes/FooterHooks.php
M resources/ext.relatedArticles.readMore/eventLogging.js
2 files changed, 2 insertions(+), 24 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles
refs/changes/96/282196/1
diff --git a/includes/FooterHooks.php b/includes/FooterHooks.php
index c28f185..a913846 100644
--- a/includes/FooterHooks.php
+++ b/includes/FooterHooks.php
@@ -130,6 +130,7 @@
);
if ( class_exists( 'EventLogging' ) ) {
+ $dependencies[] = "mediawiki.viewport";
$dependencies[] = "ext.eventLogging.Schema";
$scripts[] =
"resources/ext.relatedArticles.readMore/eventLogging.js";
}
diff --git a/resources/ext.relatedArticles.readMore/eventLogging.js
b/resources/ext.relatedArticles.readMore/eventLogging.js
index 33a4c8e..43eaf35 100644
--- a/resources/ext.relatedArticles.readMore/eventLogging.js
+++ b/resources/ext.relatedArticles.readMore/eventLogging.js
@@ -6,33 +6,10 @@
$window = $( window );
/**
- * Check if at least half of the element's height and half of its width
are in viewport
- *
- * @method
- * @param {jQuery.Object} $el - element that's being tested
- * @return {boolean}
- */
- function isElementInViewport( $el ) {
- var windowHeight = $window.height(),
- windowWidth = $window.width(),
- windowScrollLeft = $window.scrollLeft(),
- windowScrollTop = $window.scrollTop(),
- elHeight = $el.height(),
- elWidth = $el.width(),
- elOffset = $el.offset();
-
- return (
- ( windowScrollTop + windowHeight >= elOffset.top +
elHeight / 2 ) &&
- ( windowScrollLeft + windowWidth >= elOffset.left +
elWidth / 2 ) &&
- ( windowScrollTop <= elOffset.top + elHeight / 2 )
- );
- }
-
- /**
* Log when ReadMore is seen by the user
*/
function logReadMoreSeen() {
- if ( isElementInViewport( $readMore ) ) {
+ if ( mw.viewport.isElementInViewport( $readMore.get( 0 ) ) ) {
$window.off( 'scroll', logReadMoreSeen );
schemaRelatedPages.log( { eventName: 'seen' } );
}
--
To view, visit https://gerrit.wikimedia.org/r/282196
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I621aa4c21d673d8d431bb38ba094271b570ca93c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
