jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350784 )
Change subject: Switched to npm-stored graph-shared, fix mapsnapshot
......................................................................
Switched to npm-stored graph-shared, fix mapsnapshot
Bug: T164046
Change-Id: I869cba5197920c47f981ef77d0f6cc2a32d90984
---
M lib/graph2.compiled.js
M modules/graph2.js
M package.json
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/graph2.compiled.js b/lib/graph2.compiled.js
index 8c66667..13e1d04 100644
--- a/lib/graph2.compiled.js
+++ b/lib/graph2.compiled.js
@@ -4,7 +4,7 @@
'use strict';
/* global require */
- var VegaWrapper = require( 'graph-shared' );
+ var VegaWrapper = require( 'mw-graph-shared' );
// eslint-disable-next-line no-new
new VegaWrapper( {
@@ -104,7 +104,7 @@
}( jQuery, mediaWiki, vg ) );
-},{"graph-shared":3}],2:[function(require,module,exports){
+},{"mw-graph-shared":3}],2:[function(require,module,exports){
'use strict';
/**
@@ -452,7 +452,7 @@
validate(urlParts, 'lon', -180, 180, true);
var query = urlParts.query;
- if (query.style && !/^[-_0-9a-z]$/.test(query.style)) {
+ if (query.style && !/^[-_0-9a-z]+$/.test(query.style)) {
throw new Error('mapsnapshot: if style is given, it must
be letters/numbers/dash/underscores only');
}
diff --git a/modules/graph2.js b/modules/graph2.js
index fb3375c..00e4409 100644
--- a/modules/graph2.js
+++ b/modules/graph2.js
@@ -3,7 +3,7 @@
'use strict';
/* global require */
- var VegaWrapper = require( 'graph-shared' );
+ var VegaWrapper = require( 'mw-graph-shared' );
// eslint-disable-next-line no-new
new VegaWrapper( {
diff --git a/package.json b/package.json
index 9354c45..e81148d 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
"devDependencies": {
"browserify": "^13.0.0",
"eslint-config-wikimedia": "0.3.0",
- "graph-shared": "git+http://[email protected]/nyurik/graph-shared";,
+ "mw-graph-shared": "^0.3.6",
"grunt": "1.0.1",
"grunt-banana-checker": "0.5.0",
"grunt-contrib-watch": "1.0.0",
--
To view, visit https://gerrit.wikimedia.org/r/350784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I869cba5197920c47f981ef77d0f6cc2a32d90984
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
