Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/97870
Change subject: Don't show the existing page in list of results of nearby pages
......................................................................
Don't show the existing page in list of results of nearby pages
Also stop unnecessarily pushing
Bug: 57444
Change-Id: Ib97bd1680f570262e78ba37c29f0c3726fddda04
---
M javascripts/modules/nearby/Nearby.js
M javascripts/modules/nearby/NearbyApi.js
M javascripts/modules/nearby/NearbyOverlay.js
3 files changed, 14 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/70/97870/1
diff --git a/javascripts/modules/nearby/Nearby.js
b/javascripts/modules/nearby/Nearby.js
index 92a7f65..946121a 100644
--- a/javascripts/modules/nearby/Nearby.js
+++ b/javascripts/modules/nearby/Nearby.js
@@ -90,7 +90,7 @@
this.$( '.loading' ).show();
} else if ( !options.pages && !options.error &&
options.location ) {
this.$( '.loading' ).show();
- this.api.getPages( options.location, this.range
).done( function( pages ) {
+ this.api.getPages( options.location,
this.range, options.exclude ).done( function( pages ) {
self.emit( 'searchResult', pages );
if ( pages.length > 0 ) {
self.render( { pages: pages } );
diff --git a/javascripts/modules/nearby/NearbyApi.js
b/javascripts/modules/nearby/NearbyApi.js
index ecb100a..408c143 100644
--- a/javascripts/modules/nearby/NearbyApi.js
+++ b/javascripts/modules/nearby/NearbyApi.js
@@ -59,7 +59,15 @@
}
return mw.msg( msg, mw.language.convertNumber( d ) );
},
- getPages: function( location, range ) {
+ /**
+ * Renders an error in the existing view
+ *
+ * @param {Object} location: In form { latitude: 0, longitude:
2 }
+ * @param {Integer} range: Number of meters to perform a
geosearch for
+ * @param {String} exclude: Name of a title to exclude from the
list of results
+ * @return {jQuery.Deferred} Object taking list of pages as
argument
+ */
+ getPages: function( location, range, exclude ) {
var d = $.Deferred(), self = this;
this.get( {
action: 'query',
@@ -111,8 +119,9 @@
page.proximity =
self._distanceMessage( page.dist );
}
page.heading = page.title;
- pages.push( page );
- return page;
+ if ( exclude !== page.title ) {
+ return page;
+ }
} );
pages.sort( function( a, b ) {
diff --git a/javascripts/modules/nearby/NearbyOverlay.js
b/javascripts/modules/nearby/NearbyOverlay.js
index 8919268..f5bc669 100644
--- a/javascripts/modules/nearby/NearbyOverlay.js
+++ b/javascripts/modules/nearby/NearbyOverlay.js
@@ -27,6 +27,7 @@
source: options.source,
range: 2000,
parentOverlay: this,
+ exclude: options.title,
location: { longitude:
options.longitude, latitude: options.latitude },
el: this.$( '.container' )
} );
--
To view, visit https://gerrit.wikimedia.org/r/97870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib97bd1680f570262e78ba37c29f0c3726fddda04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
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
