Fix AJAX history after reload
This commit is contained in:
parent
5ee14079b8
commit
fa832055c8
|
@ -4,7 +4,9 @@
|
||||||
* @param string first three characters of database system version
|
* @param string first three characters of database system version
|
||||||
*/
|
*/
|
||||||
function bodyLoad(version) {
|
function bodyLoad(version) {
|
||||||
onpopstate(history); // copied from editor/static/editing.js
|
if (history.state !== undefined) { // copied from editor/static/editing.js
|
||||||
|
onpopstate(history);
|
||||||
|
}
|
||||||
var jushRoot = '../externals/jush/';
|
var jushRoot = '../externals/jush/';
|
||||||
var script = document.createElement('script');
|
var script = document.createElement('script');
|
||||||
script.src = jushRoot + 'jush.js';
|
script.src = jushRoot + 'jush.js';
|
||||||
|
|
|
@ -367,6 +367,8 @@ function ajaxSend(url, data, popState) {
|
||||||
onpopstate = function (event) {
|
onpopstate = function (event) {
|
||||||
if (event.state ? confirm(areYouSure) : ajaxState) {
|
if (event.state ? confirm(areYouSure) : ajaxState) {
|
||||||
ajaxSend(location.href, event.state, 1); // 1 - disable pushState
|
ajaxSend(location.href, event.state, 1); // 1 - disable pushState
|
||||||
|
} else {
|
||||||
|
ajaxState++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
Adminer 3.2.2-dev:
|
||||||
|
Fix AJAX history after reload
|
||||||
|
|
||||||
Adminer 3.2.1 (released 2011-03-23):
|
Adminer 3.2.1 (released 2011-03-23):
|
||||||
Ability to save expression in edit
|
Ability to save expression in edit
|
||||||
Respect default database collation (bug #3191489)
|
Respect default database collation (bug #3191489)
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
// Editor specific functions
|
// Editor specific functions
|
||||||
|
|
||||||
function bodyLoad(version) {
|
function bodyLoad(version) {
|
||||||
onpopstate(history);
|
if (history.state !== undefined) {
|
||||||
|
onpopstate(history);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue