Full AJAX only with pushState to work correctly with history

diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index 4390bc0c0eef548b62d1ff1586e75af69852a899..1d23d12cba374cd4f9e259f3bb4f94243b888fe1 100644 (file)
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -64,7 +64,7 @@ if ($_POST["save"]) {
 }
 ?>
 
-<form action="<?php echo h($_SERVER["REQUEST_URI"]); // required for sending the form after an AJAX request ?>" method="post" enctype="multipart/form-data">
+<form action="" method="post" enctype="multipart/form-data">
 <?php
 if ($fields) {
        echo "<table cellspacing='0'>\n";
@@ -106,8 +106,5 @@ if ($fields) {
 if ($update) {
        echo "<input type='submit' name='delete' value='" . lang('Delete') . "' onclick=\"return confirm('" . lang('Are you sure?') . "')" . (isset($_GET["select"]) ? " &amp;&amp; !ajaxForm(this.form, 'delete=1')" : "") . ";\">\n";
 }
-if (isset($_GET["select"])) {
-       echo "<a href='" . h($_SERVER["REQUEST_URI"]) . "' onclick='return !ajaxMain(this.href, undefined, event);'>" . lang('Cancel') . "</a>\n";
-}
 ?>
 </form>

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index a24b1ba8f7efe4efe866e1de36a44d0244b94433..b9bb39cb35de8b71f14a1161bda94b6a62dd044c 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -130,7 +130,7 @@ document.getElementById('username').focus();
        */
        function selectQuery($query) {
                global $jush;
-               return "<p><a href='" . h(remove_from_uri("page")) . "&amp;page=last' title='" . lang('Page') . ": " . lang('last') . "' onclick='return !ajaxMain(this.href, undefined, event);'>&gt;&gt;</a> <code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" . (is_ajax() ? " <a href='" . h($_SERVER["REQUEST_URI"]) . "'>#</a>" : "") . "\n";
+               return "<p><a href='" . h(remove_from_uri("page")) . "&amp;page=last' title='" . lang('Page') . ": " . lang('last') . "' onclick='return !ajaxMain(this.href, undefined, event);'>&gt;&gt;</a> <code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>\n";
        }
        
        /** Description of a row in a table

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 36ba89163da079ae79f2539234545d41de23a511..550fd999bb950d5b9b2e57873f9613601f6ea989 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -361,10 +361,14 @@ function redirect($location, $message = null) {
                $_SESSION["messages"][] = $message;
        }
        if (isset($location)) {
+               if ($location == "") {
+                       $location = ".";
+               }
                if (!is_ajax()) {
-                       header("Location: " . ($location != "" ? $location : "."));
+                       header("Location: $location");
                        exit;
                }
+               header("X-AJAX-Redirect: $location");
                $_POST = array();
        }
 }

diff --git a/adminer/lang/cs.inc.php b/adminer/lang/cs.inc.php
index a80e0dac896428bee93564e4e15aa3d0c5b457bd..f2cd1048e42e30eb450ed61cf10255bbfe158141 100644 (file)
--- a/adminer/lang/cs.inc.php
+++ b/adminer/lang/cs.inc.php
@@ -289,6 +289,4 @@ $translations = array(
        
        // function translation used in Editor
        'now' => 'teď',
-       
-       'Cancel' => 'Storno',
 );

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index cbb2ac89190d8231665ad2cf665e49da1029720a..a4473995bd4d97fbaa00511478cd32ef8dea92e6 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -231,7 +231,7 @@ if (!$columns) {
                        $result->seek($limit * $page);
                }
                $email_fields = array();
-               echo "<form action='" . h($_SERVER["REQUEST_URI"]) . "' method='post' enctype='multipart/form-data'>\n"; // $_SERVER["REQUEST_URI"] is required for sending the form after an AJAX request
+               echo "<form action='' method='post' enctype='multipart/form-data'>\n";
                $rows = array();
                while ($row = $result->fetch_assoc()) {
                        $rows[] = $row;

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index c04e9bde66752917aeb5a8bf75b670546dc1a792..dd161f235158e120c30439c37f665223829316ac 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -172,13 +172,17 @@ function textareaKeydown(target, event, tab, button) {
 function ajax(url, callback, data) {
        var xmlhttp = (window.XMLHttpRequest ? new XMLHttpRequest() : (window.ActiveXObject ? new ActiveXObject('Microsoft.XMLHTTP') : false));
        if (xmlhttp) {
-               xmlhttp.open((data === undefined ? 'GET' : 'POST'), url);
+               xmlhttp.open((data ? 'POST' : 'GET'), url);
                if (data) {
                        xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
                }
                xmlhttp.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
                xmlhttp.onreadystatechange = function (text) {
                        if (xmlhttp.readyState == 4) {
+                               var redirect = xmlhttp.getResponseHeader('X-AJAX-Redirect');
+                               if (redirect && history.replaceState) {
+                                       history.replaceState(null, '', redirect);
+                               }
                                callback(xmlhttp.responseText);
                        }
                };
@@ -203,16 +207,12 @@ function ajaxSetHtml(url) {
 var ajaxState = 0;
 var ajaxTimeout;
 
-/** Load content to #main
+/** Safely load content to #main
 * @param string
 * @param [string]
-* @param [MouseEvent]
 * @return XMLHttpRequest or false in case of an error
 */
-function ajaxMain(url, data, event) {
-       if (event && event.ctrlKey) {
-               return false;
-       }
+function ajaxSend(url, data) {
        var currentState = ++ajaxState;
        clearTimeout(ajaxTimeout);
        ajaxTimeout = setTimeout(function () {
@@ -230,6 +230,29 @@ function ajaxMain(url, data, event) {
        }, data);
 }
 
+/** Load content to #main
+* @param string
+* @param [string]
+* @param [MouseEvent]
+* @return XMLHttpRequest or false in case of an error
+*/
+function ajaxMain(url, data, event) {
+       if (!history.pushState || (event && event.ctrlKey)) {
+               return false;
+       }
+       history.pushState(data, '', url);
+       return ajaxSend(url, data);
+}
+
+/** Revive page from history
+* @param PopStateEvent
+*/
+window.onpopstate = function (event) {
+       if (ajaxState || event.state) {
+               ajaxSend(location.href, event.state);
+       }
+}
+
 /** Send form by AJAX GET
 * @param HTMLFormElement
 * @param [string]
@@ -239,7 +262,9 @@ function ajaxForm(form, data) {
        var params = [ ];
        for (var i=0; i < form.elements.length; i++) {
                var el = form.elements[i];
-               if (el.name && (!/checkbox|radio|submit|file/i.test(el.type) || el.checked)) {
+               if (/file/i.test(el.type) && el.value) {
+                       return false;
+               } else if (el.name && (!/checkbox|radio|submit|file/i.test(el.type) || el.checked)) {
                        params.push(encodeURIComponent(el.name) + '=' + encodeURIComponent(/select/i.test(el.tagName) ? selectValue(el) : el.value));
                }
        }