Neilk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/155475
Change subject: do not craft our own api url
......................................................................
do not craft our own api url
mediawiki.api.js is now smart enough to do this properly.
the only reason we used to craft our own url here is because
mediawiki.api.js got its start inside UploadWizard. But,
if we create our API url this way, it can mess up Selenium
testing on Vagrant due to mismatches of port numbers
Change-Id: Iac25239cf240934bd1e3ce349c05f1b41eb23b8c
---
M UploadWizard.config.php
M resources/mw.UploadWizard.js
2 files changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/75/155475/1
diff --git a/UploadWizard.config.php b/UploadWizard.config.php
index 8e9ba8a..da0d6b4 100644
--- a/UploadWizard.config.php
+++ b/UploadWizard.config.php
@@ -85,9 +85,6 @@
// File extensions acceptable in this wiki
'fileExtensions' => $wgFileExtensions,
- // The default api url is for the current wiki ( can override at run
time )
- 'apiUrl' => $wgServer . $wgScriptPath . '/api.php',
-
// Flickr details
// Flickr API is SSL-only as of June 27th, 2014:
http://code.flickr.net/2014/04/30/flickr-api-going-ssl-only-on-june-27th-2014/
'flickrApiUrl' => 'https://api.flickr.com/services/rest/?',
diff --git a/resources/mw.UploadWizard.js b/resources/mw.UploadWizard.js
index 3987fc3..f509ce8 100644
--- a/resources/mw.UploadWizard.js
+++ b/resources/mw.UploadWizard.js
@@ -7,7 +7,7 @@
mw.UploadWizard = function( config ) {
this.uploads = [];
- this.api = new mw.Api( { ajax: { url: config.apiUrl, timeout: 0 } } );
+ this.api = new mw.Api( { ajax: { timeout: 0 } } );
// making a sort of global for now, should be done by passing in config
or fragments of config when needed
// elsewhere
--
To view, visit https://gerrit.wikimedia.org/r/155475
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac25239cf240934bd1e3ce349c05f1b41eb23b8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Neilk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
