From 27caff1ce01503cb973200635666291324eb796f Mon Sep 17 00:00:00 2001 From: Piyush Vijay Date: Wed, 4 Jul 2018 06:43:44 +0530 Subject: [PATCH] Fix editing server variable not showing save or cancel option (#14328) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Editing server variable not showing save or cancel option issue #14327: fixed Signed-off-by: Piyush Vijay * Styling of the links improved. Signed-off-by: Piyush Vijay (cherry picked from commit bd7d4ca22f72353468ffe3b993ef79e79cd99804) Signed-off-by: Maurício Meneghini Fauth --- js/server_variables.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/js/server_variables.js b/js/server_variables.js index af4812acf6..6b7f01faf1 100644 --- a/js/server_variables.js +++ b/js/server_variables.js @@ -14,7 +14,7 @@ AJAX.registerOnload('server_variables.js', function () { var $cancelLink = $('a.cancelLink'); $('#serverVariables').find('.var-name').find('a').append( - $('#docImage').clone().show() + $('#docImage').clone().css('display', 'inline-block') ); /* Launches the variable editor */ @@ -29,11 +29,11 @@ AJAX.registerOnload('server_variables.js', function () { var $cell = $link.parent(); var $valueCell = $link.parents('.var-row').find('.var-value'); var varName = $link.data('variable'); - var $mySaveLink = $saveLink.clone().show(); - var $myCancelLink = $cancelLink.clone().show(); + + var $mySaveLink = $saveLink.clone().css('display', 'inline-block'); + var $myCancelLink = $cancelLink.clone().css('display', 'inline-block'); var $msgbox = PMA_ajaxShowMessage(); var $myEditLink = $cell.find('a.editLink'); - $cell.addClass('edit'); // variable is being edited $myEditLink.remove(); // remove edit link @@ -87,7 +87,9 @@ AJAX.registerOnload('server_variables.js', function () { ); // Save and replace content $cell - .html($links); + .html($links) + .children() + .css('display', 'flex'); $valueCell .data('content', $valueCell.html()) .html($editor)