wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 10:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle media select widget empty queries properly

Browse source 
If the query is cleared, we should still clear all items and abort any
loading that may be going on. We should still not try and load results
for an empty query though.

Change-Id: If23c6e0469247b1c1c47ab85b9a5a010e8a4fe26
This commit is contained in:
Trevor Parscal 2013-06-18 14:25:56 -07:00
parent 23b2da91fd
commit a8fcfb4a14
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/ve/ui/widgets/ve.ui.MWMediaSelectWidget.js
View file

@ -80,8 +80,8 @@ ve.inheritClass( ve.ui.MWMediaSelectWidget, ve.ui.Widget );
ve.ui.MWMediaSelectWidget.prototype.onInputChange = function () {
var i, len;
if ( this.loading || this.input.getValue() === '' ) {
return;
if ( this.loading ) {
this.request.abort();
}
// Reset
@ -124,7 +124,12 @@ ve.ui.MWMediaSelectWidget.prototype.onResultsScroll = function () {
* @method
*/
ve.ui.MWMediaSelectWidget.prototype.queryMediaSources = function () {
var i, len, source;
var i, len, source,
value = this.input.getValue();
if ( value === '' ) {
return;
}
for ( i = 0, len = this.sources.length; i < len; i++ ) {
source = this.sources[i];
@ -141,7 +146,7 @@ ve.ui.MWMediaSelectWidget.prototype.queryMediaSources = function () {
'format': 'json',
'action': 'query',
'generator': 'search',
'gsrsearch': this.input.getValue(),
'gsrsearch': value,
'gsrnamespace': 6,
'gsrlimit': 15,
'gsroffset': source.gsroffset,
@ -181,7 +186,12 @@ ve.ui.MWMediaSelectWidget.prototype.onMediaQueryDone = function ( source, data )
var page, title,
items = [],
pages = data.query.pages;
pages = data.query.pages,
value = this.input.getValue();
if ( value === '' ) {
return;
}
if ( data['query-continue'] && data['query-continue'].search ) {
source.gsroffset = data['query-continue'].search.gsroffset;