Yurik has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326318 )
Change subject: Bumped wmf mapdata lib req
......................................................................
Bumped wmf mapdata lib req
Change-Id: I1941dc0463631730c106aa390471ed4a9828685a
---
M lib/wikimedia-mapdata.js
M lib/wmui-base.less
M package.json
3 files changed, 58 insertions(+), 55 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer
refs/changes/18/326318/1
diff --git a/lib/wikimedia-mapdata.js b/lib/wikimedia-mapdata.js
index add9dfa..43c72e9 100644
--- a/lib/wikimedia-mapdata.js
+++ b/lib/wikimedia-mapdata.js
@@ -1,11 +1,11 @@
'use strict';
-/* globals module */
/**
* Data loader.
*
* @class Kartographer.Data.DataLoader
*/
+ // eslint-disable-next-line valid-jsdoc
var DataLoader = function ( createPromise, createResolvedPromise, mwApi,
clientStore, title, debounce, bind ) {
var DataLoader = function () {
@@ -107,7 +107,6 @@
return new DataLoader();
};
-/* globals module */
/**
* Group parent class.
*
@@ -122,7 +121,7 @@
* @param {Object} [options]
* @constructor
*/
-var Group$1 = function ( ) {
+var Group$1 = function () {
// call the constructor
this.initialize.apply( this, arguments );
};
@@ -149,13 +148,13 @@
var Group_1 = Group$1;
-/* globals module */
/**
* External Data Group.
*
* @class Kartographer.Data.Group.External
* @extends Kartographer.Data.Group
*/
+ // eslint-disable-next-line valid-jsdoc
var Group_External = function ( extend, isEmptyObject, isArray, getJSON,
mwMsg, mwUri, Group ) {
var ExternalGroup = function () {
@@ -314,7 +313,6 @@
return ExternalGroup;
};
-/* globals module */
/**
* Data store.
*
@@ -336,6 +334,7 @@
};
/**
+ * @param {string} groupId
* @return {Kartographer.Data.Group}
*/
DataStore.prototype.get = function ( groupId ) {
@@ -343,6 +342,7 @@
};
/**
+ * @param {string} groupId
* @return {boolean}
*/
DataStore.prototype.has = function ( groupId ) {
@@ -352,7 +352,6 @@
return new DataStore();
};
-/* globals module */
/**
* A hybrid group is a group that is not considered as a {@link
Kartographer.Data.Group.HybridGroup}
* because it does not implement a `fetch` method.
@@ -363,6 +362,7 @@
* @class Kartographer.Data.Group.HybridGroup
* @extends Kartographer.Data.Group
*/
+ // eslint-disable-next-line valid-jsdoc
var Group_Hybrid = function ( extend, createResolvedPromise, isPlainObject,
isArray, whenAllPromises, Group, ExternalGroup, DataLoader, DataStore ) {
var HybridGroup = function () {
@@ -414,6 +414,12 @@
};
/**
+ * Parses the GeoJSON to extract the external data sources.
+ *
+ * Creates {@link Kartographer.Data.Group.External external data groups} and
+ * keeps references of them in {@link #externals}.
+ *
+ * @param {Object|Array} apiGeoJSON The GeoJSON as returned by the API.
* @return {Promise}
*/
HybridGroup.prototype.parse = function ( apiGeoJSON ) {
@@ -454,13 +460,13 @@
return HybridGroup;
};
-/* globals module */
/**
* Internal Data Group.
*
* @class Kartographer.Data.Group.Internal
* @extends Kartographer.Data.Group.HybridGroup
*/
+ // eslint-disable-next-line valid-jsdoc
var Group_Internal = function ( extend, HybridGroup, ExternalGroup, DataLoader
) {
var InternalGroup = function () {
@@ -492,7 +498,6 @@
return InternalGroup;
};
-/* globals module */
/**
* Data Manager.
*
@@ -508,49 +513,48 @@
var DataManager = function ( wrappers ) {
- var
- createResolvedPromise = function ( value ) {
- return wrappers.createPromise( function ( resolve ) {
- resolve( value );
- } );
- },
- DataLoader$$1 = dataLoaderLib(
- wrappers.createPromise,
- createResolvedPromise,
- wrappers.mwApi,
- wrappers.clientStore,
- wrappers.title,
- wrappers.debounce,
- wrappers.bind
- ),
- ExternalGroup = externalGroupLib(
- wrappers.extend,
- wrappers.isEmptyObject,
- wrappers.isArray,
- wrappers.getJSON,
- wrappers.mwMsg,
- wrappers.mwUri,
- Group
- ),
- DataStore$$1 = dataStoreLib(),
- HybridGroup = hybridGroupLib(
- wrappers.extend,
- createResolvedPromise,
- wrappers.isPlainObject,
- wrappers.isArray,
- wrappers.whenAllPromises,
- Group,
- ExternalGroup,
- DataLoader$$1,
- DataStore$$1
- ),
- InternalGroup = internalGroupLib(
- wrappers.extend,
- HybridGroup,
- ExternalGroup,
- DataLoader$$1
- ),
- DataManager = function () {};
+ var createResolvedPromise = function ( value ) {
+ return wrappers.createPromise( function ( resolve ) {
+ resolve( value );
+ } );
+ },
+ DataLoader$$1 = dataLoaderLib(
+ wrappers.createPromise,
+ createResolvedPromise,
+ wrappers.mwApi,
+ wrappers.clientStore,
+ wrappers.title,
+ wrappers.debounce,
+ wrappers.bind
+ ),
+ ExternalGroup = externalGroupLib(
+ wrappers.extend,
+ wrappers.isEmptyObject,
+ wrappers.isArray,
+ wrappers.getJSON,
+ wrappers.mwMsg,
+ wrappers.mwUri,
+ Group
+ ),
+ DataStore$$1 = dataStoreLib(),
+ HybridGroup = hybridGroupLib(
+ wrappers.extend,
+ createResolvedPromise,
+ wrappers.isPlainObject,
+ wrappers.isArray,
+ wrappers.whenAllPromises,
+ Group,
+ ExternalGroup,
+ DataLoader$$1,
+ DataStore$$1
+ ),
+ InternalGroup = internalGroupLib(
+ wrappers.extend,
+ HybridGroup,
+ ExternalGroup,
+ DataLoader$$1
+ ),
+ DataManager = function () {};
/**
* @param {string[]} groupIds List of group ids to load.
@@ -566,11 +570,10 @@
}
for ( i = 0; i < groupIds.length; i++ ) {
group = DataStore$$1.get( groupIds[ i ] ) || DataStore$$1.add( new
InternalGroup( groupIds[ i ] ) );
- /* jshint loopfunc:true */
+ // eslint-disable-next-line no-loop-func
promises.push( wrappers.createPromise( function ( resolve ) {
group.fetch().then( resolve, resolve );
} ) );
- /* jshint loopfunc:false */
}
DataLoader$$1.fetch();
diff --git a/lib/wmui-base.less b/lib/wmui-base.less
index f0da64d..4a139a2 100644
--- a/lib/wmui-base.less
+++ b/lib/wmui-base.less
@@ -1,5 +1,5 @@
/**
- * WikimediaUI base v0.7.0
+ * WikimediaUI base v0.7.1
* Wikimedia Foundation user interface base variables
*/
diff --git a/package.json b/package.json
index b289b22..4cc7213 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
"leaflet": "^0.7.7",
"leaflet-sleep": "juliengirault/Leaflet.Sleep",
"maki": "^0.5.0",
- "wikimedia-mapdata":
"git+https://gerrit.wikimedia.org/r/mapdata#497bccd38c9a440ab32d0d64ec90f44ca8ea8d32";,
+ "wikimedia-mapdata":
"git+https://gerrit.wikimedia.org/r/mapdata#ee3a9e5dcfb89cffc28acb24e2cc281931ceaf08";,
"wmui-base":
"git+https://phabricator.wikimedia.org/diffusion/WMUI/wikimedia-ui-base.git#v0.7.1";
}
}
--
To view, visit https://gerrit.wikimedia.org/r/326318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1941dc0463631730c106aa390471ed4a9828685a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik <yu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
