Smuggli has submitted this change and it was merged.
Change subject: Renamed autocomplete file
......................................................................
Renamed autocomplete file
Autocomplete is not a widget so remove this part from the filename. Also removed
unnecessary closure because in mw.loader it is already in a closure.
Change-Id: Id7711d6ec24d677201356cffbfb1563c93a239b3
---
M ExtendedSearch/ExtendedSearch.setup.php
A ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.js
D ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
3 files changed, 73 insertions(+), 75 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/ExtendedSearch/ExtendedSearch.setup.php
b/ExtendedSearch/ExtendedSearch.setup.php
index 17e3575..0832cc5 100644
--- a/ExtendedSearch/ExtendedSearch.setup.php
+++ b/ExtendedSearch/ExtendedSearch.setup.php
@@ -20,7 +20,7 @@
) + $aResourceModuleTemplate;
$wgResourceModules['ext.bluespice.extendedsearch.autocomplete'] = array(
- 'scripts' => 'bluespice.extendedSearch.autocompleteWidget.js',
+ 'scripts' => 'bluespice.extendedSearch.autocomplete.js',
'dependencies' => array(
'jquery.ui.autocomplete'
),
diff --git a/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.js
b/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.js
new file mode 100644
index 0000000..d07f200
--- /dev/null
+++ b/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.js
@@ -0,0 +1,72 @@
+/**
+ * ExtendedSearch extension
+ *
+ * Part of BlueSpice for MediaWiki
+ *
+ * @author Stephan Muggli <[email protected]>
+ * @package Bluespice_Extensions
+ * @subpackage ExtendedSearch
+ * @copyright Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
+ * @filesource
+ */
+mw.loader.using( 'jquery.ui.autocomplete', function() {
+ var cache = [];
+ var lastXhr = {};
+
+ if ( $( "#bs-extendedsearch-input, .bs-autocomplete-field" ).length < 1
)
+ return;
+
+ var container = $( "<div id='bs-extendedsearch-autocomplete'></div>" );
+ $( "body" ).append( container );
+ $( "#bs-extendedsearch-input, .bs-autocomplete-field" ).autocomplete( {
+ appendTo: container,
+ position: {
+ my: "right top",
+ at: "right bottom"
+ },
+ source: function( req, setList ) {
+ if ( req.term in cache ) {
+ setList( cache[ req.term ] );
+ } else {
+ var url = bs.util.getAjaxDispatcherUrl(
+
'ExtendedSearchBase::getAutocompleteData',
+ [ encodeURIComponent( req.term
) ]
+ );
+ var lastXhr = $.ajax( {
+ url: url,
+ dataType: 'json',
+ success: function( response,
textStatus, xhr ) {
+ if ( response == null ||
response.length == '0' ) {
+ $( '.ui-autocomplete'
).css( 'display', 'none' );
+ } else {
+ if ( xhr === lastXhr ) {
+ setList(
response );
+ }
+ cache[ req.term ] =
response;
+ }
+ },
+ failure: function() {
+ }
+ } );
+ }
+ },
+ focus: function( event, ui ) {
+ $( '.ui-corner-all' ).unbind( 'mouseleave' );
+ },
+ select: function( event, ui ) {
+ var status = { skipFurtherProcessing: false };
+ $( document ).trigger(
'BSExtendedSearchAutocompleteItemSelect', [ event, ui, status ] );
+ if ( status.skipFurtherProcessing )
+ return;
+ document.location.href = "" + ui.item.link;
+ }
+ } );
+
+ $.ui.autocomplete.prototype._renderItem = function( ul, item ) {
+ return $( "<li class='" + item.attr + "'></li>" )
+ .data( "item.autocomplete", item )
+ .append( "<a>" + item.label + "</a>" )
+ .appendTo( ul );
+ };
+} );
diff --git
a/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
b/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
deleted file mode 100644
index 63c7efd..0000000
--- a/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * ExtendedSearch extension
- *
- * Part of BlueSpice for MediaWiki
- *
- * @author Stephan Muggli <[email protected]>
- * @package Bluespice_Extensions
- * @subpackage ExtendedSearch
- * @copyright Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
- * @filesource
- */
-( function( mw, $ ) {
- mw.loader.using( 'jquery.ui.autocomplete', function() {
- var cache = { };
- var lastXhr = { };
-
- if ( $( "#bs-extendedsearch-input, .bs-autocomplete-field"
).length < 1 )
- return;
-
- var container = $( "<div
id='bs-extendedsearch-autocomplete'></div>" );
- $( "body" ).append( container );
- $( "#bs-extendedsearch-input, .bs-autocomplete-field"
).autocomplete( {
- appendTo: container,
- position: {
- my: "right top",
- at: "right bottom"
- },
- source: function( req, setList ) {
- if ( req.term in cache ) {
- setList( cache[ req.term ] );
- } else {
- var url = bs.util.getAjaxDispatcherUrl(
-
'ExtendedSearchBase::getAutocompleteData',
- [ encodeURIComponent(
req.term ) ]
- );
- var lastXhr = $.ajax( {
- url: url,
- dataType: 'json',
- success: function( response,
textStatus, xhr ) {
- if ( response == null
|| response.length == '0' ) {
- $(
'.ui-autocomplete' ).css( 'display', 'none' );
- } else {
- if ( xhr ===
lastXhr ) {
-
setList( response );
- }
- cache[ req.term
] = response;
- }
- },
- failure: function() {
- }
- } );
- }
- },
- focus: function( event, ui ) {
- $( '.ui-corner-all' ).unbind( 'mouseleave' );
- },
- select: function( event, ui ) {
- var status = { skipFurtherProcessing: false };
- $( document ).trigger(
'BSExtendedSearchAutocompleteItemSelect', [ event, ui, status ] );
- if ( status.skipFurtherProcessing )
- return;
- document.location.href = "" + ui.item.link;
- }
- } );
-
- $.ui.autocomplete.prototype._renderItem = function( ul, item ) {
- return $( "<li class='" + item.attr + "'></li>" )
- .data( "item.autocomplete", item )
- .append( "<a>" + item.label + "</a>" )
- .appendTo( ul );
- };
- } );
-}( mediaWiki, jQuery ) );
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/169733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id7711d6ec24d677201356cffbfb1563c93a239b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pigpen <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: Smuggli <[email protected]>
Gerrit-Reviewer: Tweichart <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
