The branch, QA_3_4 has been updated
via ad5c7f5d0ae4e0eda4089cd760b64e4b53f0cf70 (commit)
from f7a31e5f4c71594a053c81ebac34d91ff930c51a (commit)
- Log -----------------------------------------------------------------
commit ad5c7f5d0ae4e0eda4089cd760b64e4b53f0cf70
Author: Madhura Jayaratne <[email protected]>
Date: Wed Oct 5 08:55:19 2011 +0530
bug #3418849 [interface] Inline edit shows dropdowns even after closing
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
js/sql.js | 25 +++++++++++++++----------
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index edf76a7..f884d4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
3.4.7.0 (not yet released)
- bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] =
false
+- bug #3418849 [interface] Inline edit shows dropdowns even after closing
3.4.6.0 (not yet released)
- patch #3404173 InnoDB comment display with tooltips/aliases
diff --git a/js/sql.js b/js/sql.js
index 34ab158..ad91104 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -710,14 +710,13 @@ $(document).ready(function() {
'sql_query' : sql_query,
'inline_edit' : true
}, function(data) {
- if(data.success == true) {
+ if(data.success == true &&
$edit_td.hasClass('inline_edit_active')) {
$this_field.append('<textarea>'+data.value+'</textarea>');
- $this_field.data('original_data', data_value);
- }
- else {
+ } else {
PMA_ajaxShowMessage(data.error);
}
}) // end $.post()
+ $this_field.data('original_data', data_value);
}
else if($this_field.is('.relation')) {
/** @lends jQuery */
@@ -738,9 +737,11 @@ $(document).ready(function() {
}
$.post('sql.php', post_params, function(data) {
- $this_field.append(data.dropdown);
- $this_field.data('original_data', data_value);
+ if ($edit_td.hasClass('inline_edit_active')) {
+ $this_field.append(data.dropdown);
+ }
}) // end $.post()
+ $this_field.data('original_data', data_value);
}
else if($this_field.is('.enum')) {
/** @lends jQuery */
@@ -759,9 +760,11 @@ $(document).ready(function() {
'curr_value' : curr_value
}
$.post('sql.php', post_params, function(data) {
- $this_field.append(data.dropdown);
- $this_field.data('original_data', data_value);
+ if ($edit_td.hasClass('inline_edit_active')) {
+ $this_field.append(data.dropdown);
+ }
}) // end $.post()
+ $this_field.data('original_data', data_value);
}
else if($this_field.is('.set')) {
/** @lends jQuery */
@@ -781,9 +784,11 @@ $(document).ready(function() {
}
$.post('sql.php', post_params, function(data) {
- $this_field.append(data.select);
- $this_field.data('original_data', data_value);
+ if ($edit_td.hasClass('inline_edit_active')) {
+ $this_field.append(data.select);
+ }
}) // end $.post()
+ $this_field.data('original_data', data_value);
}
else if($this_field.is('.null')) {
//handle null fields
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
