From f56307346e2ab68a47be17bec7f991b83740aab8 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Fri, 29 Mar 2013 17:48:59 +0100 Subject: [PATCH] refs #3813 fixed language selector: always use form to post data, as token_auth is required for users so setting a correct link is obsolete now --- .../LanguagesManager/templates/languageSelector.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/LanguagesManager/templates/languageSelector.js b/plugins/LanguagesManager/templates/languageSelector.js index cde3457190a..1240374d74c 100644 --- a/plugins/LanguagesManager/templates/languageSelector.js +++ b/plugins/LanguagesManager/templates/languageSelector.js @@ -6,10 +6,13 @@ */ $(document).ready(function () { + + var languageSelector = $("#languageSelection"); + // no Language sector on the page - if ($("#languageSelection").size() == 0) return false; + if (languageSelector.size() == 0) return; - $("#languageSelection input").hide(); + languageSelector.find("input").hide(); var select = $("#language").hide(); var langSelect = $("") .insertAfter(select) @@ -31,10 +34,11 @@ $(document).ready(function () { })); }, select: function (event, ui) { + event.preventDefault(); ui.item.option.selected = true; if (ui.item.value) { langSelect.text(ui.item.label); - $('#languageSelection form').submit(); + $('#languageSelection').find('form').submit(); } else if (ui.item.href) { window.open(ui.item.href); } @@ -55,7 +59,7 @@ $(document).ready(function () { $(ul).attr('id', 'languageSelect'); return $( "
  • " ) .data( "item.ui-autocomplete", item ) - .append( "
    " + item.label + "" ) + .append( "" + item.label + "" ) .appendTo( ul ); };