[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1814-g1b94d12
Marc Delisle
lem9 at users.sourceforge.net
Sun Mar 6 12:12:11 CET 2011
The branch, master has been updated
via 1b94d12c3e00fae78cc8042e1628a80ef5f817b7 (commit)
from 74a61f61da8de73853c17a5f198d63c3d675d046 (commit)
- Log -----------------------------------------------------------------
commit 1b94d12c3e00fae78cc8042e1628a80ef5f817b7
Author: onebighack <onebighack at users.sourceforge.net>
Date: Sun Mar 6 06:09:52 2011 -0500
-Bug #3200692 Second click on Inline edit
-Bug #3200579 Hiding Inline edit problematic for text/geometry/blob:
partial fix
-----------------------------------------------------------------------
Summary of changes:
js/sql.js | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/js/sql.js b/js/sql.js
index 49380b0..a3c5c79 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('<span class="nowrap"></span>');
+ $chg_submit.children('span.nowrap').text(PMA_messages['strInlineEdit']);
}
else {
$chg_submit.children('span.nowrap').empty();
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list