Smuggli has submitted this change and it was merged.
Change subject: Also search files in search as you type
......................................................................
Also search files in search as you type
No files were searched in search as you type even it as enabled
Change-Id: Ia0267183657394f17e10e0694a6d2981dae8b2c7
---
M ExtendedSearch/ExtendedSearch.class.php
M ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
2 files changed, 11 insertions(+), 6 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index ecf28d0..c1ba179 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -96,7 +96,7 @@
// max 32 chars with userlevel! 123 456789012345678
90123456789012 '::' counts as one char :-)
BsConfig::registerVar( 'MW::ExtendedSearch::DefFuzziness',
'0.5', BsConfig::TYPE_STRING, 'bs-extendedsearch-pref-defduzziness' );
BsConfig::registerVar( 'MW::ExtendedSearch::LimitResults', 15,
BsConfig::TYPE_INT|BsConfig::LEVEL_USER,
'bs-extendedsearch-pref-limitresultdef', 'int' );
- BsConfig::registerVar( 'MW::ExtendedSearch::SearchFiles', true,
BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-searchfiles',
'toggle' );
+ BsConfig::registerVar( 'MW::ExtendedSearch::SearchFiles', true,
BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER|BsConfig::RENDER_AS_JAVASCRIPT,
'bs-extendedsearch-pref-searchfiles', 'toggle' );
BsConfig::registerVar( 'MW::ExtendedSearch::JumpToTitle',
false, BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER,
'bs-extendedsearch-pref-jumptotitle', 'toggle' );
BsConfig::registerVar( 'MW::ExtendedSearch::ShowCreateSugg',
true, BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER,
'bs-extendedsearch-pref-showcreatesugg', 'toggle' );
BsConfig::registerVar( 'MW::ExtendedSearch::ShowFacets', true,
BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-showfacets',
'toggle' );
diff --git a/ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
b/ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
index 7dddd64..a1785f8 100644
--- a/ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
+++ b/ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
@@ -348,10 +348,11 @@
* Search as you type results
*/
searchAsYouType: function() {
- var inputField = $(
'#bs-extendedsearch-inputfieldtext-specialpage' );
- var url;
- var thread;
- var keys = new Array( 13, 17, 18, 20, 27, 32, 37, 38, 39, 40,
112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123 );
+ var inputField = $(
'#bs-extendedsearch-inputfieldtext-specialpage' ),
+ url,
+ thread,
+ keys = new Array( 13, 17, 18, 20, 27, 32, 37, 38, 39,
40, 112,
+ 113, 114, 115, 116,
117, 118, 119, 120, 121, 122, 123 );
inputField.keydown( function() {
clearTimeout( thread );
@@ -360,9 +361,13 @@
inputField.keyup( function( event ) {
clearTimeout( thread );
if ( $.inArray( event.which, keys ) > 0 ) return false;
- if ( inputField.val() == '' ) return false;
+ if ( inputField.val() === '' ) return false;
url = wgServer + wgScriptPath +
'?search_scope=text&search_submit=1&q='
+ encodeURIComponent( inputField.val() );
+
+ if ( typeof bsExtendedSearchSearchFiles !== 'undefined'
) {
+ url += '&search_files=' + (
bsExtendedSearchSearchFiles ) ? 1 : 0;
+ }
thread = setTimeout( function() {
ExtendedSearchAjaxManager.ajaxMeANewResultsPlz( url ) }, 300 );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/166745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0267183657394f17e10e0694a6d2981dae8b2c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli <[email protected]>
Gerrit-Reviewer: Smuggli <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
