Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150054
Change subject: Switch between json/jsonp for local/remote api search
......................................................................
Switch between json/jsonp for local/remote api search
In the media search widget use 'json' for remote searches and
'jsonp' for local searches.
Bug: 64822
Change-Id: Iccc9adb1261602f4bc7426f1caf5aed87aad51e5
---
M modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/54/150054/1
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
index 7ba489a..3b05d11 100755
--- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
@@ -100,7 +100,7 @@
* @method
*/
ve.ui.MWMediaSearchWidget.prototype.queryMediaSources = function () {
- var i, len, source, url,
+ var i, len, source, url, dataType,
value = this.query.getValue();
if ( value === '' ) {
@@ -124,10 +124,12 @@
}
if ( source.local ) {
url = mw.util.wikiScript( 'api' );
+ dataType = 'json';
} else {
// If 'apiurl' is set, use that. Otherwise,
build the url
// from scriptDirUrl and /api.php suffix
url = source.apiurl || ( source.scriptDirUrl +
'/api.php' );
+ dataType = 'jsonp';
}
this.query.pushPending();
source.request =
ve.init.target.constructor.static.apiRequest( {
@@ -149,7 +151,7 @@
// TODO: Only use JSON-P for cross-domain.
// jQuery has this logic built-in (if url is
not same-origin ..)
// but isn't working for some reason.
- 'dataType': 'jsonp'
+ 'dataType': dataType
} )
.done( this.onMediaQueryDone.bind( this, source
) )
.always( this.onMediaQueryAlways.bind( this,
source ) );
--
To view, visit https://gerrit.wikimedia.org/r/150054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iccc9adb1261602f4bc7426f1caf5aed87aad51e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
