jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Use correct indentation level
......................................................................
Hygiene: Use correct indentation level
Change-Id: Ibf2ca7abb800153ecb3413bdb05bdbfb3640c777
---
M javascripts/Overlay.js
M javascripts/application.js
M javascripts/loggingSchemas/mobileWebEditing.js
M javascripts/modules/categories/init.js
M javascripts/modules/nearby/Nearby.js
5 files changed, 56 insertions(+), 55 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/Overlay.js b/javascripts/Overlay.js
index fda08b8..c111ab6 100644
--- a/javascripts/Overlay.js
+++ b/javascripts/Overlay.js
@@ -92,23 +92,23 @@
if ( M.isIos && this.hasFixedHeader ) {
$overlayContent
- .on( 'touchstart', function ( ev ) {
- startY =
ev.originalEvent.touches[0].pageY;
- } )
- .on( 'touchmove', function ( ev ) {
- var
- y =
ev.originalEvent.touches[0].pageY,
- contentLenght =
$overlayContent.prop( 'scrollHeight' ) - $overlayContent.outerHeight();
+ .on( 'touchstart', function ( ev ) {
+ startY =
ev.originalEvent.touches[0].pageY;
+ } )
+ .on( 'touchmove', function ( ev ) {
+ var
+ y =
ev.originalEvent.touches[0].pageY,
+ contentLenght =
$overlayContent.prop( 'scrollHeight' ) - $overlayContent.outerHeight();
- ev.stopPropagation();
- // prevent scrolling and bouncing
outside of .overlay-content
- if (
- ( $overlayContent.scrollTop()
=== 0 && startY < y ) ||
- ( $overlayContent.scrollTop()
=== contentLenght && startY > y )
- ) {
- ev.preventDefault();
- }
- } );
+ ev.stopPropagation();
+ // prevent scrolling and
bouncing outside of .overlay-content
+ if (
+ (
$overlayContent.scrollTop() === 0 && startY < y ) ||
+ (
$overlayContent.scrollTop() === contentLenght && startY > y )
+ ) {
+ ev.preventDefault();
+ }
+ } );
// wait for things to render before doing any
calculations
setTimeout( function () {
diff --git a/javascripts/application.js b/javascripts/application.js
index ae9f1ad..9d4d333 100644
--- a/javascripts/application.js
+++ b/javascripts/application.js
@@ -208,10 +208,10 @@
*/
function supportsAnimations() {
var el = $( '<p>' )[0], $iframe = $( '<iframe>' ),
has3d, t,
- transforms = {
- webkitTransform: '-webkit-transform',
- transform: 'transform'
- };
+ transforms = {
+ webkitTransform: '-webkit-transform',
+ transform: 'transform'
+ };
// don't trust Android 2.x, really
// animations cause textareas to misbehave on it
diff --git a/javascripts/loggingSchemas/mobileWebEditing.js
b/javascripts/loggingSchemas/mobileWebEditing.js
index bebe047..3a6cb76 100644
--- a/javascripts/loggingSchemas/mobileWebEditing.js
+++ b/javascripts/loggingSchemas/mobileWebEditing.js
@@ -3,15 +3,15 @@
function log( data ) {
var options = {
- token: M.getSessionId(),
- revId: mw.config.get( 'wgRevisionId' ),
- namespace: mw.config.get( 'wgNamespaceNumber' ),
- userEditCount: user.getEditCount() || 0,
- isTestA: M.isTestA,
- pageId: mw.config.get( 'wgArticleId' ),
- username: user.getName() || '',
- mobileMode: M.getMode()
- };
+ token: M.getSessionId(),
+ revId: mw.config.get( 'wgRevisionId' ),
+ namespace: mw.config.get( 'wgNamespaceNumber' ),
+ userEditCount: user.getEditCount() || 0,
+ isTestA: M.isTestA,
+ pageId: mw.config.get( 'wgArticleId' ),
+ username: user.getName() || '',
+ mobileMode: M.getMode()
+ };
return M.log( 'MobileWebEditing', $.extend( options, data ) );
}
diff --git a/javascripts/modules/categories/init.js
b/javascripts/modules/categories/init.js
index 1917376..9f654da 100644
--- a/javascripts/modules/categories/init.js
+++ b/javascripts/modules/categories/init.js
@@ -8,9 +8,8 @@
loadingOverlay.hide();
result.resolve( new CategoryOverlay( {
- categories: mw.config.get(
'wgCategories' )
- } )
- );
+ categories: mw.config.get( 'wgCategories' )
+ } ) );
} );
return result;
} );
diff --git a/javascripts/modules/nearby/Nearby.js
b/javascripts/modules/nearby/Nearby.js
index 31162a1..6746cb9 100644
--- a/javascripts/modules/nearby/Nearby.js
+++ b/javascripts/modules/nearby/Nearby.js
@@ -48,21 +48,21 @@
var result = $.Deferred();
if ( M.supportsGeoLocation() ) {
navigator.geolocation.getCurrentPosition(
function ( geo ) {
- result.resolve( { latitude:
geo.coords.latitude, longitude: geo.coords.longitude } );
- },
- function ( err ) {
- // see
https://developer.mozilla.org/en-US/docs/Web/API/PositionError
- if ( err.code === 1 ) {
- err = 'permission';
- } else {
- err = 'location';
- }
- result.reject( err );
- },
- {
- timeout: 10000,
- enableHighAccuracy: true
- } );
+ result.resolve( { latitude:
geo.coords.latitude, longitude: geo.coords.longitude } );
+ },
+ function ( err ) {
+ // see
https://developer.mozilla.org/en-US/docs/Web/API/PositionError
+ if ( err.code === 1 ) {
+ err = 'permission';
+ } else {
+ err = 'location';
+ }
+ result.reject( err );
+ },
+ {
+ timeout: 10000,
+ enableHighAccuracy: true
+ } );
} else {
result.reject( 'incompatible' );
}
@@ -135,16 +135,18 @@
};
if ( options.latitude && options.longitude ) {
- this.nearbyApi.getPages(
- { latitude: options.latitude,
longitude: options.longitude },
- this.range, options.exclude
- )
- .done( pagesSuccess )
- .fail( pagesError );
+ this.nearbyApi.getPages( {
+ latitude:
options.latitude,
+ longitude:
options.longitude
+ },
+ this.range, options.exclude
+ )
+ .done( pagesSuccess )
+ .fail( pagesError );
} else if ( options.pageTitle ) {
this.nearbyApi.getPagesAroundPage(
options.pageTitle, this.range )
- .done( pagesSuccess )
- .fail( pagesError );
+ .done( pagesSuccess )
+ .fail( pagesError );
} else {
if ( options.errorType ) {
options.error = this.errorMessages[
options.errorType ];
--
To view, visit https://gerrit.wikimedia.org/r/174396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf2ca7abb800153ecb3413bdb05bdbfb3640c777
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
