dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add $wgReauthenticateTime to extension.json"
[lhc/web/wiklou.git]
/
resources
/
src
/
mediawiki.widgets
/
mw.widgets.SearchInputWidget.js
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
index
75bf891
..
76c6718
100644
(file)
--- a/
resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
+++ b/
resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
@@
-4,7
+4,7
@@
* @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
* @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
-( function (
$, mw
) {
+( function () {
/**
* Creates a mw.widgets.SearchInputWidget object.
/**
* Creates a mw.widgets.SearchInputWidget object.
@@
-156,6
+156,7
@@
// tracking purposes
promise.done( function ( data, jqXHR ) {
self.requestType = jqXHR.getResponseHeader( 'X-OpenSearch-Type' );
// tracking purposes
promise.done( function ( data, jqXHR ) {
self.requestType = jqXHR.getResponseHeader( 'X-OpenSearch-Type' );
+ self.searchId = jqXHR.getResponseHeader( 'X-Search-ID' );
} );
return promise;
} );
return promise;
@@
-173,10
+174,12
@@
data: response || {},
metadata: {
type: this.requestType || 'unknown',
data: response || {},
metadata: {
type: this.requestType || 'unknown',
+ searchId: this.searchId || null,
query: this.getQueryValue()
}
};
this.requestType = undefined;
query: this.getQueryValue()
}
};
this.requestType = undefined;
+ this.searchId = undefined;
return resp;
};
return resp;
};
@@
-191,7
+194,7
@@
urls = data.data[ 3 ],
self = this;
urls = data.data[ 3 ],
self = this;
- // eslint-disable-next-line
no-restricted-properties
+ // eslint-disable-next-line
jquery/no-each-util
$.each( titles, function ( i, result ) {
items.push( new mw.widgets.TitleOptionWidget(
self.getOptionWidgetData(
$.each( titles, function ( i, result ) {
items.push( new mw.widgets.TitleOptionWidget(
self.getOptionWidgetData(
@@
-215,6
+218,7
@@
action: 'impression-results',
numberOfResults: items.length,
resultSetType: data.metadata.type,
action: 'impression-results',
numberOfResults: items.length,
resultSetType: data.metadata.type,
+ searchId: data.metadata.searchId,
query: data.metadata.query,
inputLocation: this.dataLocation || 'header'
} );
query: data.metadata.query,
inputLocation: this.dataLocation || 'header'
} );
@@
-248,4
+252,4
@@
return items;
};
return items;
};
-}(
jQuery, mediaWiki
) );
+}() );