Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server
2011-03-12 04:40:12 +01:00

108
js/sql.js
View File

@@ -423,99 +423,77 @@ $(document).ready(function() {
// looping through all columns or rows, to find the required data and then storing it in an array. // looping through all columns or rows, to find the required data and then storing it in an array.
var $this_children = $(this).children('span.nowrap').children('a').children('span.nowrap'); var $this_children = $(this).children('span.nowrap').children('a').children('span.nowrap');
if (disp_mode != 'vertical'){ if (disp_mode != 'vertical') {
$this_children.empty(); $this_children.empty();
$this_children.text(PMA_messages['strSave']); $this_children.text(PMA_messages['strSave']);
} else { } else {
// vertical // vertical
data_vt = $this_children.html(); data_vt = $this_children.html();
$this_children.text(PMA_messages['strSave']); $this_children.text(PMA_messages['strSave']);
} }
var hide_link = '<br /><br /><a id="hide">' + PMA_messages['strHide'] + '</a>'; var hide_link = '<br /><br /><a id="hide">' + PMA_messages['strHide'] + '</a>';
if (disp_mode != 'vertical'){ if (disp_mode != 'vertical') {
$(this).append(hide_link); $(this).append(hide_link);
$('#table_results tbody tr td a#hide').click(function(){ $('#table_results tbody tr td a#hide').click(function() {
$this_children = $(this).siblings('span.nowrap').children('a').children('span.nowrap'); $this_children = $(this).siblings('span.nowrap').children('a').children('span.nowrap');
$this_children.empty(); $this_children.empty();
$this_children.text(PMA_messages['strInlineEdit']); $this_children.text(PMA_messages['strInlineEdit']);
var $this_hide = $(this).parent(); var $this_hide = $(this).parent();
$this_hide.removeClass("inline_edit_active hover").addClass("inline_edit_anchor"); $this_hide.removeClass("inline_edit_active hover").addClass("inline_edit_anchor");
$this_hide.parent().removeClass("hover");
$this_hide.siblings().removeClass("hover");
var last_column = $this_hide.siblings().length; var last_column = $this_hide.siblings().length;
var txt = []; var txt = '';
var blob_index = []; for(var i = 4; i < last_column; i++) {
var k = 0; if($this_hide.siblings("td:eq(" + i + ")").hasClass("inline_edit") == false) {
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; continue;
} }
txt[i - 4] = $this_hide.siblings("td:eq(" + i + ")").children(' .original_data').html(); txt = $this_hide.siblings("td:eq(" + i + ")").children(' .original_data').html();
} if($this_hide.siblings("td:eq(" + i + ")").children().length != 0) {
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 + ")").empty();
$this_hide.siblings("td:eq(" + i + ")").append(txt[i-4]); $this_hide.siblings("td:eq(" + i + ")").append(txt);
} }
} }
$(this).prev().prev().remove(); $(this).prev().prev().remove();
$(this).prev().remove(); $(this).prev().remove();
$(this).remove(); $(this).remove();
}); });
} else { } else {
var txt=[]; var txt = '';
var rows=$(this).parent().siblings().length;; var rows = $(this).parent().siblings().length;
$(this).append(hide_link); $(this).append(hide_link);
$('#table_results tbody tr td a#hide').click(function(){ $('#table_results tbody tr td a#hide').click(function() {
var pos = $(this).parent().index();
var $chg_submit = $(this).parent().children('span.nowrap').children('a').children('span.nowrap');
$chg_submit.empty();
$chg_submit.append(data_vt);
var pos=$(this).parent().index(); var $this_row = $(this).parent().parent();
var $chg_submit=$(this).parent().children('span.nowrap').children('a').children('span.nowrap'); if(parseInt(pos) % 2 == 0) {
$chg_submit.empty(); $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active").addClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor");
$chg_submit.append(data_vt);
var $this_row=$(this).parent().parent(); $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active hover").addClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor");
//alert(pos); } else {
if(parseInt(pos)%2==0){ $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active").addClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor");
$this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active").addClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor");
$this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active hover").addClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor");
} else {
$this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active").addClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor");
$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");
$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++){
if( $this_row.siblings("tr:eq(" + i + ") td:eq(" + pos + ")").hasClass("inline_edit") == false) {
continue;
} }
var blob_index = []; txt = $this_row.siblings("tr:eq(" + i + ") td:eq(" + pos + ") span.original_data").html();
var k = 0; $this_row.siblings("tr:eq(" + i + ") td:eq(" + pos + ")").empty();
for( var i = 6; i <= rows + 2; i++){ $this_row.siblings("tr:eq(" + i + ") td:eq(" + pos + ")").append(txt);
if( $this_row.siblings("tr:eq(" + i + ") td:eq(" + pos + ") a:eq(0)").length !=0 ){ }
blob_index[k] = i; $(this).prev().remove();
k++; $(this).prev().remove();
continue; $(this).remove();
} });
txt[i - 6] = $this_row.siblings("tr:eq(" + i + ") td:eq("+pos+") span.original_data").html();
}
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();
$(this).remove();
});
} }
// Initialize some variables // Initialize some variables
@@ -919,7 +897,9 @@ $(document).ready(function() {
} }
PMA_ajaxShowMessage(data.message); PMA_ajaxShowMessage(data.message);
$this_td.removeClass('inline_edit_active').addClass('inline_edit_anchor'); $this_td.removeClass('inline_edit_active hover').addClass('inline_edit_anchor');
$this_td.parent().removeClass('hover')
$this_td.siblings().removeClass('hover');
$input_siblings.each(function() { $input_siblings.each(function() {
// Inline edit post has been successful. // Inline edit post has been successful.