Don't scroll with AJAX select order and alter move column

This commit is contained in:
Jakub Vrana 2011-07-28 14:25:16 +02:00
parent 5046f71f9a
commit aeae30ffb7
2 changed files with 6 additions and 3 deletions

View file

@ -309,7 +309,7 @@ function ajaxSend(url, data, popState, noscroll) {
history.pushState(data, '', url); //! remember window position history.pushState(data, '', url); //! remember window position
} }
} }
if (!noscroll) { if (!noscroll && !/&order/.test(url)) {
scrollTo(0, 0); scrollTo(0, 0);
} }
setHtml('content', xmlhttp.responseText); setHtml('content', xmlhttp.responseText);
@ -376,9 +376,9 @@ function ajaxForm(form, data, noscroll) {
params.push(data); params.push(data);
} }
if (form.method == 'post') { if (form.method == 'post') {
return ajaxSend((/\?/.test(form.action) ? form.action : location.href), params.join('&'), noscroll); // ? - always part of Adminer URL return ajaxSend((/\?/.test(form.action) ? form.action : location.href), params.join('&'), false, noscroll); // ? - always part of Adminer URL
} }
return ajaxSend((form.action || location.href).replace(/\?.*/, '') + '?' + params.join('&'), noscroll); return ajaxSend((form.action || location.href).replace(/\?.*/, '') + '?' + params.join('&'), '', false, noscroll);
} }

View file

@ -1,3 +1,6 @@
Adminer 3.3.2-dev:
Don't scroll with AJAX select order and alter move column
Adminer 3.3.1 (released 2011-07-27): Adminer 3.3.1 (released 2011-07-27):
Fix XSS introduced in Adminer 3.2.0 Fix XSS introduced in Adminer 3.2.0
Fix altering default values (PostgreSQL) Fix altering default values (PostgreSQL)