Merge pull request #1523 from madhuracj/rfe1602

Alternative implementation for rfe #1602

1 files changed, 15 insertions, 43 deletions

diff --git a/js/sql.js b/js/sql.js
index 4d03d30834..49e0723973 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -100,16 +100,11 @@ AJAX.registerTeardown('sql.js', function () {
     $(document).off('click', 'th.column_heading.marker');
     $(window).unbind('scroll');
     $(document).off("keyup", ".filter_rows");
-
     if (codemirror_editor) {
-        codemirror_editor.off('change', PMA_handleQueryChanges);
-    }
-    $('#sqlquery').off('input propertychange', PMA_handleQueryChanges);
-    if (PMA_consoleInput) {
-        PMA_consoleInput.off('change', PMA_handleConsoleChanges);
+        codemirror_editor.off('change');
+    } else {
+        $('#sqlquery').off('input propertychange');
     }
-    $('#pma_console').off('input propertychange', PMA_handleConsoleChanges);
-
     $('body').off('click', '.navigation .showAllRows');
     $('body').off('click','a.browse_foreign');
     $('body').off('click', '#simulate_dml');
@@ -137,16 +132,20 @@ AJAX.registerOnload('sql.js', function () {
 
     $(function () {
         if (codemirror_editor) {
-            codemirror_editor.on('change', PMA_handleQueryChanges);
-        } else {
-            $('#sqlquery').on('input propertychange', PMA_handleQueryChanges);
-        }
-        if (PMA_consoleInput) {
-            PMA_consoleInput.on('change', PMA_handleConsoleChanges);
+            codemirror_editor.on('change', function () {
+                var query = codemirror_editor.getValue();
+                if (query) {
+                    $.cookie('auto_saved_sql', query);
+                }
+            });
         } else {
-            $('#pma_console').on('input propertychange', PMA_handleConsoleChanges);
+            $('#sqlquery').on('input propertychange', function () {
+                var query = $('#sqlquery').val();
+                if (query) {
+                    $.cookie('auto_saved_sql', query);
+                }
+            });
         }
-        PMA_handleConsoleChanges();
     });
 
     // Delete row from SQL results
@@ -575,33 +574,6 @@ AJAX.registerOnload('sql.js', function () {
     });
 }); // end $()
 
-function PMA_handleQueryChanges() {
-
-    var query = null;
-
-    if (codemirror_editor) {
-        query = codemirror_editor.getValue();
-    } else {
-        query = $('#sqlquery').val();
-    }
-    if (PMA_consoleInput.getText() !== query) {
-        PMA_consoleInput.setText(query);
-    }
-}
-
-function PMA_handleConsoleChanges() {
-
-    var query = PMA_consoleInput.getText();
-
-    if (codemirror_editor) {
-        if (query !== codemirror_editor.getValue()) {
-            codemirror_editor.setValue(query);
-        }
-    } else if (query !== $('#sqlquery').val()) {
-        $('#sqlquery').val(query);
-    }
-}
-
 /**
  * Starting from some th, change the class of all td under it.
  * If isAddClass is specified, it will be used to determine whether to add or remove the class.