[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-28-g989a1f3

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  989a1f35e9288f70fc7255b6368880185a7d60a2 (commit)
       via  20a04b2f2bf7935201b28bca609e488c82b05254 (commit)
      from  aa8c5f56d2063cb51ef1f1d5ad27cd0866be495a (commit)


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 js/functions.js |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 4d4f9c5..2359502 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -743,21 +743,19 @@ function insertQuery(queryType) {
             valDis += "[value-" + NbSelect + "]";
             editDis += myListBox.options[i].value + "=[value-" + NbSelect + "]";
         }
-    if (queryType == "selectall") {
-        query = "SELECT * FROM `" + table + "` WHERE 1";
-    } else if (queryType == "select") {
-        query = "SELECT " + chaineAj + " FROM `" + table + "` WHERE 1";
-    } else if (queryType == "insert") {
-           query = "INSERT INTO `" + table + "`(" + chaineAj + ") VALUES (" + valDis + ")";
-    } else if (queryType == "update") {
-        query = "UPDATE `" + table + "` SET " + editDis + " WHERE 1";
-    } else if(queryType == "delete") {
-        query = "DELETE FROM `" + table + "` WHERE 1";
-    } else if(queryType == "clear") {
-        query = '';
-    }
-    document.sqlform.sql_query.value = query;
-    sql_box_locked = false;
+        if (queryType == "selectall") {
+            query = "SELECT * FROM `" + table + "` WHERE 1";
+        } else if (queryType == "select") {
+            query = "SELECT " + chaineAj + " FROM `" + table + "` WHERE 1";
+        } else if (queryType == "insert") {
+               query = "INSERT INTO `" + table + "`(" + chaineAj + ") VALUES (" + valDis + ")";
+        } else if (queryType == "update") {
+            query = "UPDATE `" + table + "` SET " + editDis + " WHERE 1";
+        } else if(queryType == "delete") {
+            query = "DELETE FROM `" + table + "` WHERE 1";
+        }
+        document.sqlform.sql_query.value = query;
+        sql_box_locked = false;
     }
 }
 
@@ -1145,7 +1143,11 @@ $(document).ready(function(){
     });
 
     $('.sqlbutton').click(function(evt){
-        insertQuery(evt.target.id);
+        if (evt.target.id == 'clear') {
+            $('#sqlquery').val('');
+        } else {
+            insertQuery(evt.target.id);
+        }
         return false;
     });
 


hooks/post-receive
-- 
phpMyAdmin