beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Display AJAX loader together with page

Browse source
This commit is contained in:
Jakub Vrana 2011-03-11 16:47:37 +01:00
parent 1a0369adc0
commit 6fee8048e0
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adminer/include/design.inc.php
View file

@ -35,9 +35,10 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
<div id="content"> <div id="content">
<?php <?php
} }
echo '<p id="breadcrumb">';
if (isset($breadcrumb)) { if (isset($breadcrumb)) {
$link = substr(preg_replace('~(username|db|ns)=[^&]*&~', '', ME), 0, -1); $link = substr(preg_replace('~(username|db|ns)=[^&]*&~', '', ME), 0, -1);
echo '<p id="breadcrumb"><a href="' . ($link ? h($link) : ".") . '">' . $drivers[DRIVER] . '</a> &raquo; '; echo '<a href="' . ($link ? h($link) : ".") . '">' . $drivers[DRIVER] . '</a> &raquo; ';
$link = substr(preg_replace('~(db|ns)=[^&]*&~', '', ME), 0, -1); $link = substr(preg_replace('~(db|ns)=[^&]*&~', '', ME), 0, -1);
$server = (SERVER != "" ? h(SERVER) : lang('Server')); $server = (SERVER != "" ? h(SERVER) : lang('Server'));
if ($breadcrumb === false) { if ($breadcrumb === false) {
@ -61,6 +62,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
echo "$title\n"; echo "$title\n";
} }
} }
echo "<span id='loader'></span>\n";
echo "<h2>$title_all</h2>\n"; echo "<h2>$title_all</h2>\n";
restart_session(); restart_session();
$uri = preg_replace('~^[^?]*~', '', $_SERVER["REQUEST_URI"]); $uri = preg_replace('~^[^?]*~', '', $_SERVER["REQUEST_URI"]);

12
adminer/static/functions.js
View file

@ -270,23 +270,19 @@ function ajaxSetHtml(url) {
}); });
} }
var ajaxState = 0, ajaxTimeout; var ajaxState = 0;
/** Safely load content to #content /** Safely load content to #content
* @param string * @param string
* @param [string] * @param [string]
* @param [boolean]
* @return XMLHttpRequest or false in case of an error * @return XMLHttpRequest or false in case of an error
*/ */
function ajaxSend(url, data) { function ajaxSend(url, data, popState) {
var currentState = ++ajaxState; var currentState = ++ajaxState;
clearTimeout(ajaxTimeout); setHtml('loader', '<img src="../adminer/static/loader.gif" alt="">');
ajaxTimeout = setTimeout(function () {
scrollTo(0, 0);
setHtml('content', '<img src="../adminer/static/loader.gif" alt="">');
}, 500); // defer displaying loader
return ajax(url, function (text) { return ajax(url, function (text) {
if (currentState == ajaxState) { if (currentState == ajaxState) {
clearTimeout(ajaxTimeout);
scrollTo(0, 0); scrollTo(0, 0);
setHtml('content', text); setHtml('content', text);
var content = document.getElementById('content'); var content = document.getElementById('content');