Jhernandez has uploaded a new change for review.
https://gerrit.wikimedia.org/r/276442
Change subject: Remove util.isElementInViewport in favor of mw.viewport
......................................................................
Remove util.isElementInViewport in favor of mw.viewport
Bug: T129468
Change-Id: I233d7b8d8bc34dd0d6608d689068ba6ea45f6643
---
M extension.json
M resources/mobile.startup/Skin.js
M resources/mobile.startup/util.js
M resources/skins.minerva.scripts/init.js
4 files changed, 5 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/42/276442/1
diff --git a/extension.json b/extension.json
index 7d611ae..5b9bef1 100644
--- a/extension.json
+++ b/extension.json
@@ -560,6 +560,7 @@
"mobile.oo",
"mobile.user",
"mediawiki.api",
+ "mediawiki.viewport",
"mobile.settings",
"jquery.throttle-debounce"
],
diff --git a/resources/mobile.startup/Skin.js b/resources/mobile.startup/Skin.js
index 84f4ed7..3766f9e 100644
--- a/resources/mobile.startup/Skin.js
+++ b/resources/mobile.startup/Skin.js
@@ -2,7 +2,6 @@
var browser = M.require( 'mobile.browser/browser' ),
View = M.require( 'mobile.view/View' ),
- util = M.require( 'mobile.startup/util' ),
context = M.require( 'mobile.context/context' );
/**
@@ -187,7 +186,7 @@
var $placeholder = $( placeholder );
if (
- util.isElementInViewport(
$placeholder ) &&
+
mw.viewport.isElementInViewport( placeholder ) &&
$placeholder.find( '.spinner'
).is( ':visible' )
) {
self.loadImage( $placeholder );
diff --git a/resources/mobile.startup/util.js b/resources/mobile.startup/util.js
index b0c83e2..d3573ec 100644
--- a/resources/mobile.startup/util.js
+++ b/resources/mobile.startup/util.js
@@ -1,6 +1,5 @@
-( function ( M, $ ) {
- var util,
- $window = $( window );
+( function ( M ) {
+ var util;
/**
* Utility library
@@ -37,35 +36,6 @@
}
}
return id;
- },
-
- /**
- * Check if some of the element is in viewport
- * FIXME: Remove in favor of core's mw.viewport once T129466 is
fixed
- *
- * @method
- * @param {jQuery.Object} $el - element that's being tested
- * @return {Boolean}
- */
- isElementInViewport: function ( $el ) {
- var windowHeight = $window.height(),
- windowWidth = $window.width(),
- windowScrollLeft = $window.scrollLeft(),
- windowScrollTop = $window.scrollTop(),
- elHeight = $el.height(),
- elWidth = $el.width(),
- elOffset = $el.offset();
-
- return (
- // Bottom border must be below viewport's top
- ( elOffset.top + elHeight >= windowScrollTop )
&&
- // Top border must be above viewport's bottom
- ( elOffset.top <= windowScrollTop +
windowHeight ) &&
- // Right border must be after viewport's left
border
- ( elOffset.left + elWidth >= windowScrollLeft )
&&
- // left border must be before viewport's right
border
- ( elOffset.left <= windowScrollLeft +
windowWidth )
- );
}
};
diff --git a/resources/skins.minerva.scripts/init.js
b/resources/skins.minerva.scripts/init.js
index bafb1d4..844ed43 100644
--- a/resources/skins.minerva.scripts/init.js
+++ b/resources/skins.minerva.scripts/init.js
@@ -1,7 +1,6 @@
( function ( M, $ ) {
var inSample, inStable, experiment,
settings = M.require( 'mobile.settings/settings' ),
- util = M.require( 'mobile.startup/util' ),
time = M.require( 'mobile.modifiedBar/time' ),
token = settings.get( 'mobile-betaoptin-token' ),
BetaOptinPanel = M.require( 'mobile.betaoptin/BetaOptinPanel' ),
@@ -59,7 +58,7 @@
* @ignore
*/
function logLanguageButtonImpression() {
- if ( util.isElementInViewport( $languageSelector ) ) {
+ if ( mw.viewport.isElementInViewport(
$languageSelector[0] ) ) {
M.off( 'scroll', logLanguageButtonImpression );
schemaMobileWebLanguageSwitcher.log( {
--
To view, visit https://gerrit.wikimedia.org/r/276442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I233d7b8d8bc34dd0d6608d689068ba6ea45f6643
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jhernandez <jhernan...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
