bryce/jquery.uls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix my broken merge conflict result

Browse Source
This commit is contained in:
Niklas Laxström
2018-02-06 16:35:39 +02:00
parent 2b1cc8678f
commit 9fba3ab728
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/jquery.uls.languagefilter.js
View File

@@ -208,6 +208,8 @@
results = []; results = [];
$.each( result.languagesearch, function ( code, name ) { $.each( result.languagesearch, function ( code, name ) {
var target;
if ( this.options.languages[ code ] ) { if ( this.options.languages[ code ] ) {
autofillLabel = autofillLabel || name; autofillLabel = autofillLabel || name;
results.push( code ); results.push( code );
@@ -220,6 +222,8 @@
autofillLabel = autofillLabel || name; autofillLabel = autofillLabel || name;
results.push( target ); results.push( target );
} }
}.bind( this ) );
return $.Deferred().resolve( query, results, autofillLabel ); return $.Deferred().resolve( query, results, autofillLabel );
}.bind( this ) ); }.bind( this ) );
}, },