Merge "(bug 41349) mediawiki.searchSuggest: Reorder code + fix selectors"

[lhc/web/wiklou.git] / resources / mediawiki / mediawiki.searchSuggest.js

diff --git a/resources/mediawiki/mediawiki.searchSuggest.js b/resources/mediawiki/mediawiki.searchSuggest.js
index 42c839c..99a5557 100644 (file)
--- a/resources/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/mediawiki/mediawiki.searchSuggest.js
@@ -3,7 +3,7 @@
  */
 ( function ( mw, $ ) {
        $( document ).ready( function ( $ ) {
-               var map,
+               var map, searchboxesSelectors,
                        // Region where the suggestions box will appear directly below
                        // (using the same width). Can be a container element or the input
                        // itself, depending on what suits best in the environment.
@@ -14,14 +14,6 @@
                        $searchRegion = $( '#simpleSearch, #searchInput' ).first(),
                        $searchInput = $( '#searchInput' );
 
-               // Ensure that the thing is actually present!
-               if ( $searchRegion.length === 0 ) {
-                       // Don't try to set anything up if simpleSearch is disabled sitewide.
-                       // The loader code loads us if the option is present, even if we're
-                       // not actually enabled (anymore).
-                       return;
-               }
-
                // Compatibility map
                map = {
                        browsers: {
@@ -49,13 +41,19 @@
                        return;
                }
 
-               // Placeholder text for search box
-               $searchInput
-                       .attr( 'placeholder', mw.msg( 'searchsuggest-search' ) )
-                       .placeholder();
-
                // General suggestions functionality for all search boxes
-               $( '#searchInput, #searchInput2, #powerSearchText, #searchText' )
+               searchboxesSelectors = [
+                       // Primary searchbox on every page in standard skins
+                       '#searchInput',
+                       // Secondary searchbox in legacy skins (LegacyTemplate::searchForm uses id "searchInput + unique id")
+                       '#searchInput2',
+                       // Special:Search
+                       '#powerSearchText',
+                       '#searchText',
+                       // Generic selector for skins with multiple searchboxes (used by CologneBlue)
+                       '.mw-searchInput'
+               ];
+               $( searchboxesSelectors.join(', ') )
                        .suggestions( {
                                fetch: function ( query ) {
                                        var $el, jqXhr;
@@ -85,7 +83,7 @@
                                        var jqXhr = $(this).data( 'request' );
                                        // If the delay setting has caused the fetch to have not even happened
                                        // yet, the jqXHR object will have never been set.
-                                       if ( jqXhr && $.isFunction ( jqXhr.abort ) ) {
+                                       if ( jqXhr && $.isFunction( jqXhr.abort ) ) {
                                                jqXhr.abort();
                                                $(this).removeData( 'request' );
                                        }
@@ -104,6 +102,19 @@
                                $( this ).trigger( 'keypress' );
                        } );
 
+               // Ensure that the thing is actually present!
+               if ( $searchRegion.length === 0 ) {
+                       // Don't try to set anything up if simpleSearch is disabled sitewide.
+                       // The loader code loads us if the option is present, even if we're
+                       // not actually enabled (anymore).
+                       return;
+               }
+
+               // Placeholder text for search box
+               $searchInput
+                       .attr( 'placeholder', mw.msg( 'searchsuggest-search' ) )
+                       .placeholder();
+
                // Special suggestions functionality for skin-provided search box
                $searchInput.suggestions( {
                        result: {
@@ -119,9 +130,7 @@
                                                        .append(
                                                                $( '<div>' )
                                                                        .addClass( 'special-label' )
-                                                                       .text( mw.msg( 'searchsuggest-containing' ) )
-                                                       )
-                                                       .append(
+                                                                       .text( mw.msg( 'searchsuggest-containing' ) ),
                                                                $( '<div>' )
                                                                        .addClass( 'special-query' )
                                                                        .text( query )
@@ -130,17 +139,13 @@
                                                        .show();
                                        } else {
                                                $el.find( '.special-query' )
-                                                       .empty()
                                                        .text( query )
                                                        .autoEllipsis();
                                        }
                                },
                                select: function ( $input ) {
                                        $input.closest( 'form' ).append(
-                                               $( '<input type="hidden"/>', {
-                                                       name: 'fulltext',
-                                                       val: '1'
-                                               })
+                                               $( '<input type="hidden" name="fulltext" value="1"/>' )
                                        );
                                        $input.closest( 'form' ).submit();
                                }
@@ -158,4 +163,4 @@
 
        } );
 
-}( mediaWiki, jQuery ) );
\ No newline at end of file
+}( mediaWiki, jQuery ) );