Commit 70f550ec authored by Leigh B. Stoller's avatar Leigh B. Stoller

Trac ticket #209; Loading indicators did not clear in FireFox 3.0.

This turned out to be Firefox doing the right thing, I guess. We had
used the same names for two sets of loading indicators and Firefox was
(properly?) clearing the first set but not the second. I think Safari
was doing the same thing, not that I think about it.
parent eafeeb3a
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006, 2007 University of Utah and the Flux Group.
* Copyright (c) 2006-2008 University of Utah and the Flux Group.
* All rights reserved.
*/
/*
......@@ -19,7 +19,7 @@ if (user_agent.indexOf("firefox") != -1) {
}
/* Clear the various 'loading' indicators. */
function ClearLoadingIndicators(done_msg)
function ClearBusyIndicators(done_msg)
{
var busyimg = getObjbyName('busy');
var loadingspan = getObjbyName('loading');
......@@ -33,11 +33,6 @@ function ClearLoadingIndicators(done_msg)
loadingspan.innerHTML = done_msg;
}
function ClearBusyIndicators(done_msg)
{
ClearLoadingIndicators(done_msg);
}
function HideBusyIndicators()
{
var loadingdiv = getObjbyName('outer_loaddiv');
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006, 2007 University of Utah and the Flux Group.
* Copyright (c) 2006-2008 University of Utah and the Flux Group.
* All rights reserved.
*/
var LOG_STATE_LOADING = 1;
......@@ -59,7 +59,14 @@ if (is_safari) {
/* Clear the various 'loading' indicators. */
function ml_loadFinished() {
ClearLoadingIndicators("<center><b>Done!</b></center>");
/* Clear the various loading indicators. */
var busyimg = getObjbyName('load_busy');
var loadingspan = getObjbyName('load_loading');
busyimg.style.display = "none";
busyimg.src = "1px.gif";
loadingspan.innerHTML = "<center><b>Done!</b></center>";
nextState = LOG_STATE_LOADED;
}
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group.
# Copyright (c) 2005-2008 University of Utah and the Flux Group.
# All rights reserved.
#
require_once("Sajax.php");
......@@ -113,8 +113,8 @@ function STARTLOG($object)
$url = CreateURL("spewlogfile", $object);
echo "<center>\n";
echo "<img id='busy' src='busy.gif'>
<span id='loading'> Working ...</span>";
echo "<img id='load_busy' src='busy.gif'>
<span id='load_loading'> Working ...</span>";
echo "</center>\n";
echo "<br>\n";
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
# Copyright (c) 2006, 2007, 2008 University of Utah and the Flux Group.
# All rights reserved.
#
#
......@@ -2196,7 +2196,7 @@ class TemplateInstance
$html .= " </div>\n";
$html .= " <img border=0 ";
$html .= " onLoad=\"ClearLoadingIndicators('');\" ";
$html .= " onLoad=\"ClearBusyIndicators('');\" ";
$html .= " src='linkgraph_image.php?instance=$exptidx";
$html .= "&graphtype=$graphtype${runarg}";
$html .= "${srcarg}${dstarg}'>\n";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment