Skip to content
Browse files

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

  • Loading branch information...
1 parent 5046f71 commit aeae30ffb7a6d0dadab39e6c72791debc0622613 @vrana vrana committed
Showing with 6 additions and 3 deletions.
  1. +3 −3 adminer/static/functions.js
  2. +3 −0 changes.txt
View
6 adminer/static/functions.js
@@ -309,7 +309,7 @@ function ajaxSend(url, data, popState, noscroll) {
history.pushState(data, '', url); //! remember window position
}
}
- if (!noscroll) {
+ if (!noscroll && !/&order/.test(url)) {
scrollTo(0, 0);
}
setHtml('content', xmlhttp.responseText);
@@ -376,9 +376,9 @@ function ajaxForm(form, data, noscroll) {
params.push(data);
}
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
3 changes.txt
@@ -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):
Fix XSS introduced in Adminer 3.2.0
Fix altering default values (PostgreSQL)

0 comments on commit aeae30f

Please sign in to comment.
Something went wrong with that request. Please try again.