From 1b94d12c3e00fae78cc8042e1628a80ef5f817b7 Mon Sep 17 00:00:00 2001 From: onebighack Date: Sun, 6 Mar 2011 06:09:52 -0500 Subject: [PATCH] -Bug #3200692 Second click on Inline edit -Bug #3200579 Hiding Inline edit problematic for text/geometry/blob: partial fix --- js/sql.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/js/sql.js b/js/sql.js index 49380b0fc..a3c5c79af 100644 --- a/js/sql.js +++ b/js/sql.js @@ -438,10 +438,13 @@ $(document).ready(function() { var txt=[]; for(var i=4; i < last_column; i++){ txt[i-4] = $this_hide.siblings("td:eq(" + i + ")").children(' .original_data').html(); + } for (var i=4; i < last_column; i++){ - $this_hide.siblings("td:eq(" + i + ")").empty(); - $this_hide.siblings("td:eq(" + i + ")").append(txt[i-4]); + if($this_hide.siblings("td:eq(" + i + ")").children().length !=0){ + $this_hide.siblings("td:eq(" + i + ")").empty(); + $this_hide.siblings("td:eq(" + i + ")").append(txt[i-4]); + } } $(this).prev().prev().remove(); $(this).prev().remove(); @@ -878,7 +881,8 @@ $(document).ready(function() { for ( var i=0;i<=2;i++) { $del_hide.next().remove(); } if(disp_mode!='vertical'){ $chg_submit.empty(); - $chg_submit.text(PMA_messages['strInlineEdit']); + $chg_submit.html(''); + $chg_submit.children('span.nowrap').text(PMA_messages['strInlineEdit']); } else { $chg_submit.children('span.nowrap').empty();