Smuggli has submitted this change and it was merged.
Change subject: resourceloader + js error fix
......................................................................
resourceloader + js error fix
* changed resourceloader method to include in big js file
* fixed id problem
* code formatting
Change-Id: I520fa4f1da59f3a5f4462688ad37bb99a483a788
---
M ExtendedSearch/ExtendedSearch.class.php
M ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
2 files changed, 25 insertions(+), 25 deletions(-)
Approvals:
Robert Vogel: Checked; Looks good to me, but someone else must approve
Smuggli: Verified; Looks good to me, approved
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index b85d4d4..be4ef6c 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -180,8 +180,8 @@
*/
public function onBeforePageDisplay( $oOut, $oSkin ) {
$oOut->addModuleStyles(
'ext.bluespice.extendedsearch.autocomplete.style' );
- $oOut->addModuleScripts(
'ext.bluespice.extendedsearch.autocomplete' );
- $oOut->addModuleScripts( 'ext.bluespice.extendedsearch.focus' );
+ $oOut->addModules( 'ext.bluespice.extendedsearch.autocomplete'
);
+ $oOut->addModules( 'ext.bluespice.extendedsearch.focus' );
return true;
}
diff --git
a/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
b/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
index 10127f9..d2c6c72 100644
--- a/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
+++ b/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
@@ -10,16 +10,20 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
* @filesource
*/
-( function ( mw, $ ) {
- $( function () {
+( function( mw, $ ) {
+ $( function() {
mw.loader.using( 'jquery.ui.autocomplete', function() {
- var cache = {};
- var lastXhr = {};
+ var cache = { };
+ var lastXhr = { };
- if( $( "#bs-extendedsearch-input,
.bs-autocomplete-field" ).length < 1 ) return;
+ 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( {
- position: {
+ appendTo: container,
+ position: {
my: "right top",
at: "right bottom"
},
@@ -28,9 +32,9 @@
setList( cache[ req.term ] );
} else {
var url =
bs.util.getAjaxDispatcherUrl(
-
'ExtendedSearchBase::getAutocompleteData',
- [ encodeURIComponent(
req.term ) ]
- );
+
'ExtendedSearchBase::getAutocompleteData',
+ [
encodeURIComponent( req.term ) ]
+ );
var lastXhr = $.ajax( {
url: url,
dataType: 'json',
@@ -44,7 +48,8 @@
cache[
req.term ] = response;
}
},
- failure: function() {}
+ failure: function() {
+ }
} );
}
},
@@ -53,24 +58,19 @@
},
select: function( event, ui ) {
var status = { skipFurtherProcessing:
false };
- $(document).trigger(
'BSExtendedSearchAutocompleteItemSelect', [event, ui, status] );
- if ( status.skipFurtherProcessing )
return;
+ $( document ).trigger(
'BSExtendedSearchAutocompleteItemSelect', [ event, ui, status ] );
+ if ( status.skipFurtherProcessing )
+ return;
document.location.href = "" +
ui.item.link;
}
- } ).data( "autocomplete" )._renderMenu = function( ul,
items ) {
- ul.attr( 'id',
'bs-extendedsearch-autocomplete' );
- var self = this;
- $.each( items, function( index, item ) {
- self._renderItem( ul, item );
- });
- };
+ } );
$.ui.autocomplete.prototype._renderItem = function( ul,
item ) {
return $( "<li class='" + item.attr + "'></li>"
)
- .data( "item.autocomplete", item )
- .append( "<a>" + item.label + "</a>" )
- .appendTo( ul );
+ .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/148366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I520fa4f1da59f3a5f4462688ad37bb99a483a788
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart <[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]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
