diff options
author | Piyush Vijay <piyushvijay.1997@gmail.com> | 2018-04-16 17:03:28 +0300 |
---|---|---|
committer | Piyush Vijay <piyushvijay.1997@gmail.com> | 2018-04-16 17:03:28 +0300 |
commit | e58dd74c40a10d79628de70b6a5b0856940fee2c (patch) | |
tree | 3ae6031755f629bf71d4fa75634e45c13d9f00c6 /js | |
parent | 96ceade3ffe6d87867e7f44cb0fd365a7af1ba8a (diff) |
Remember table's sorting broken in 4.8.0 issue: #14189 fixed
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>
Diffstat (limited to 'js')
-rw-r--r-- | js/sql.js | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -167,9 +167,17 @@ AJAX.registerOnload('sql.js', function () { PMA_autosaveSQL($('#sqlquery').val()); }); // Save sql query with sort - $('select[name="sql_query"]').on('change', function () { - PMA_autosaveSQLSort($('select[name="sql_query"]').val()); - }); + if ($('#RememberSorting') !== undefined && $('#RememberSorting').is(':checked')) { + $('select[name="sql_query"]').on('change', function () { + PMA_autosaveSQLSort($('select[name="sql_query"]').val()); + }); + } else { + if (isStorageSupported('localStorage') && window.localStorage.auto_saved_sql_sort !== undefined) { + window.localStorage.removeItem('auto_saved_sql_sort'); + } else { + Cookies.set('auto_saved_sql_sort', ''); + } + } // If sql query with sort for current table is stored, change sort by key select value var sortStoredQuery = (isStorageSupported('localStorage') && typeof window.localStorage.auto_saved_sql_sort !== 'undefined') ? window.localStorage.auto_saved_sql_sort : Cookies.get('auto_saved_sql_sort'); if (typeof sortStoredQuery !== 'undefined' && sortStoredQuery !== $('select[name="sql_query"]').val() && $('select[name="sql_query"] option[value="' + sortStoredQuery + '"]').length !== 0) { |