MarkTraceur has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53390
Change subject: Pass in an apiURI to the WikiConfig constructor
......................................................................
Pass in an apiURI to the WikiConfig constructor
I've taken out the parsoidConfig parameter and made sure to pass in a valid
URI to the WikiConfig constructor in the useLocalConfig case.
Change-Id: Ic43067a2980f2c49fe82e39a933c8ca28fa357b4
---
M js/lib/mediawiki.WikiConfig.js
M js/lib/mediawiki.parser.environment.js
2 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/90/53390/1
diff --git a/js/lib/mediawiki.WikiConfig.js b/js/lib/mediawiki.WikiConfig.js
index 9ac75a2..df411a0 100644
--- a/js/lib/mediawiki.WikiConfig.js
+++ b/js/lib/mediawiki.WikiConfig.js
@@ -15,7 +15,7 @@
conf.iwp = prefix;
- if ( uri && ( !parsoidConf || !parsoidConf.useLocalConfig ) ) {
+ if ( uri ) {
this.apiURI = uri;
}
diff --git a/js/lib/mediawiki.parser.environment.js
b/js/lib/mediawiki.parser.environment.js
index d8624e1..b664d5e 100644
--- a/js/lib/mediawiki.parser.environment.js
+++ b/js/lib/mediawiki.parser.environment.js
@@ -208,8 +208,14 @@
} else {
var confRequest = new ConfigRequest( confSource, this );
confRequest.on( 'src', function ( error, resultConf ) {
+ var thisuri = confSource;
+ if ( this.conf.parsoid.useLocalConfig ) {
+ // It's a local config. So this URI doesn't
really matter.
+ // But it should still get passed in.
+ thisuri = 'http://localhost/wiki/api.php';
+ }
if ( error === null ) {
- this.conf.wiki = new WikiConfig( resultConf,
prefix, confSource, this.conf.parsoid );
+ this.conf.wiki = new WikiConfig( resultConf,
prefix, thisuri );
}
cb( error );
--
To view, visit https://gerrit.wikimedia.org/r/53390
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic43067a2980f2c49fe82e39a933c8ca28fa357b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
