From eccd0e194531d559d12f70328f96f45a4222ad4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Thu, 8 Feb 2018 15:26:15 +0200 Subject: [PATCH] Change code structure a bit per code review comments --- src/jquery.uls.languagefilter.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/jquery.uls.languagefilter.js b/src/jquery.uls.languagefilter.js index 1b5b0a3..4b474d0 100644 --- a/src/jquery.uls.languagefilter.js +++ b/src/jquery.uls.languagefilter.js @@ -208,17 +208,16 @@ results = []; $.each( result.languagesearch, function ( apiCode, name ) { - var code, - redirect = $.uls.data.isRedirect( apiCode ); + var code, redirect; if ( this.options.languages[ apiCode ] ) { code = apiCode; - } else if ( redirect && this.options.languages[ redirect ] ) { - // Language tags are messy. Try to make sure we handle - // them gracefully with regards to redirects. - code = redirect; } else { - return; + redirect = $.uls.data.isRedirect( apiCode ); + if ( !redirect || !this.options.languages[ redirect ] ) { + return; + } + code = redirect; } // Because of the redirect checking above, we might get duplicates.