From ba3064d51480c3e13af9f5ba47322d5ad710de6e Mon Sep 17 00:00:00 2001 From: cigamit Date: Sat, 1 Dec 2018 07:44:34 -0600 Subject: [PATCH] Resolving Issue #2196 JavaScript errors when rendering languages using Classic skin plus one unreported issue in aggregate templates resulting from the same logic error. --- aggregate_templates.php | 2 +- include/layout.js | 32 ++++++++++++++++++-------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/aggregate_templates.php b/aggregate_templates.php index 927958c3ce..df1f2b389d 100644 --- a/aggregate_templates.php +++ b/aggregate_templates.php @@ -411,7 +411,7 @@ function aggregate_template_edit() { $('#save_component_template').parent().next('table').css('display', 'none'); } else { $('#graph_template_id').prop('disabled', true); - if ($('#graph_template_id').selectmenu('widget')) { + if ($('#graph_template_id').selectmenu('instance') !== undefined) { $('#graph_template_id').selectmenu('disable'); } } diff --git a/include/layout.js b/include/layout.js index 52ab93c5ca..3789a48650 100644 --- a/include/layout.js +++ b/include/layout.js @@ -745,21 +745,25 @@ function applySkin() { } function renderLanguages() { - $('select#user_language').selectmenu('destroy').languageselect({ - width: '220', - change: function() { - name = $(this).attr('id'); - value = $(this).val(); - page = basename(location.pathname); - if (page == 'auth_profile.php') { - $.get('auth_profile.php?tab='+currentTab+'&action=update_data&name='+name+'&value='+value, function() { - if (name == 'selected_theme' || name == 'user_language') { - document.location = 'auth_profile.php?action=edit'; - } - }); + if ($('select#user_language').selectmenu('instance') !== undefined) { + $('select#user_language').selectmenu('destroy'); + + $('select#user_language').languageselect({ + width: '220', + change: function() { + name = $(this).attr('id'); + value = $(this).val(); + page = basename(location.pathname); + if (page == 'auth_profile.php') { + $.get('auth_profile.php?tab='+currentTab+'&action=update_data&name='+name+'&value='+value, function() { + if (name == 'selected_theme' || name == 'user_language') { + document.location = 'auth_profile.php?action=edit'; + } + }); + } } - } - }).languageselect('menuWidget').addClass('ui-menu-icons customicons'); + }).languageselect('menuWidget').addClass('ui-menu-icons customicons'); + } $('#user_language-menu').css('max-height', '200px'); }