The branch, master has been updated via 896a6e0883f1bfdcf5a1ec2eb6404b3eb9e0e7d5 (commit) via db276b0657580b2e6585b5faa39ea8f0cc9a0a16 (commit) from f85a923b9171cb5f0dc082c18c542ee329b396fc (commit)

- Log ----------------------------------------------------------------- commit 896a6e0883f1bfdcf5a1ec2eb6404b3eb9e0e7d5 Author: Marc Delisle marc@infomarc.info Date: Mon Mar 7 08:34:56 2011 -0500

Improve formatting

commit db276b0657580b2e6585b5faa39ea8f0cc9a0a16 Author: onebighack onebighack@users.sourceforge.net Date: Mon Mar 7 08:29:13 2011 -0500

Bug #3200579 part 2 - Hiding inline edit problematic for BLOB transformations

-----------------------------------------------------------------------

Summary of changes: js/sql.js | 44 +++++++++++++++++++++++++++++++++----------- 1 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/js/sql.js b/js/sql.js index a3c5c79..aa49d8e 100644 --- a/js/sql.js +++ b/js/sql.js @@ -435,12 +435,23 @@ $(document).ready(function() { var $this_hide = $(this).parent(); $this_hide.removeClass("inline_edit_active hover").addClass("inline_edit_anchor"); var last_column = $this_hide.siblings().length; - var txt=[]; - for(var i=4; i < last_column; i++){ - txt[i-4] = $this_hide.siblings("td:eq(" + i + ")").children(' .original_data').html(); - + var txt = []; + var blob_index = []; + var k = 0; + for(var i = 4; i < last_column; i++){ + if($this_hide.siblings("td:eq(" + i + ")").children('a:eq(0)').length ){ + blob_index[k] = i; + k++; + continue; + } + txt[i - 4] = $this_hide.siblings("td:eq(" + i + ")").children(' .original_data').html(); } - for (var i=4; i < last_column; i++){ + k = 0; + for (var i = 4; i < last_column; i++){ + if ( blob_index[k] == i){ + k++; + continue; + } 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]); @@ -474,13 +485,24 @@ $(document).ready(function() { $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active hover").addClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor");

} - - for( var i=6;i<=rows+2;i++){ - txt[i-6]=$this_row.siblings("tr:eq("+i+") td:eq("+pos+") span.original_data").html(); + var blob_index = []; + var k = 0; + for( var i = 6; i <= rows + 2; i++){ + if( $this_row.siblings("tr:eq(" + i + ") td:eq(" + pos + ") a:eq(0)").length !=0 ){ + blob_index[k] = i; + k++; + continue; + } + txt[i - 6] = $this_row.siblings("tr:eq(" + i + ") td:eq("+pos+") span.original_data").html(); } - for (var i=6;i<=rows+2;i++){ - $this_row.siblings("tr:eq("+i+") td:eq("+pos+")").empty(); - $this_row.siblings("tr:eq("+i+") td:eq("+pos+")").append(txt[i-6]); + k = 0; + for (var i = 6; i <= rows + 2; i++){ + if(blob_index[k] == i){ + k++; + continue; + } + $this_row.siblings("tr:eq("+i+") td:eq("+pos+")").empty(); + $this_row.siblings("tr:eq("+i+") td:eq("+pos+")").append(txt[ i - 6]); } $(this).prev().remove(); $(this).prev().remove();

hooks/post-receive