jenkins-bot has submitted this change and it was merged.
Change subject: Remove the isElementInViewport function
......................................................................
Remove the isElementInViewport function
Use mw.viewport.isElementInViewport instead.
Bug: T124317
Change-Id: I349e6115cf8509017189912febb40fea61bd755b
---
M extension.json
M resources/ext.quicksurveys.lib/lib.js
2 files changed, 2 insertions(+), 26 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 5558026..1535f5d 100644
--- a/extension.json
+++ b/extension.json
@@ -73,6 +73,7 @@
"dependencies": [
"mediawiki.user",
"mediawiki.storage",
+ "mediawiki.viewport",
"mediawiki.experiments",
"schema.QuickSurveyInitiation"
],
diff --git a/resources/ext.quicksurveys.lib/lib.js
b/resources/ext.quicksurveys.lib/lib.js
index 8b7f031..48400b3 100644
--- a/resources/ext.quicksurveys.lib/lib.js
+++ b/resources/ext.quicksurveys.lib/lib.js
@@ -6,31 +6,6 @@
surveyImpressionLogger;
/**
- * // FIXME: upstream the similar code from the 'mobile.startup/util'
module and use it
- * // see https://phabricator.wikimedia.org/T124317
- * Check if at least half of the element's height and half of its width
are in viewport
- *
- * @ignore
- * @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 impression when a survey is seen by the user
*
* @param {jQuery.Object} $el
@@ -38,7 +13,7 @@
* @ignore
*/
function logSurveyImpression( $el, config ) {
- if ( isElementInViewport( $el ) ) {
+ if ( mw.viewport.isElementInViewport( $el.get( 0 ) ) ) {
$window.off( 'scroll.quickSurveys',
surveyImpressionLogger );
if ( mw.eventLog ) {
--
To view, visit https://gerrit.wikimedia.org/r/282194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I349e6115cf8509017189912febb40fea61bd755b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
