Commit fdd6dd30 authored by Jonathon Duerig's avatar Jonathon Duerig

More fixes. Remove logging. isajax and asajax are similar identifiers, but not similar enough.

parent 78137599
...@@ -9,9 +9,7 @@ ...@@ -9,9 +9,7 @@
var lastIndex = 0; var lastIndex = 0;
// The url is the same as this one with 'spewlogfile.php3' instead of // The url is the same as this one with 'spewlogfile.php3' instead of
// the current path. // the current path.
var url = window.location.protocol + '//' + var url = 'spewlogfile.php3' +
window.location.host +
'/spewlogfile.php3' +
window.location.search + '&isajax=1'; window.location.search + '&isajax=1';
// Fetch spewlogfile via AJAX call // Fetch spewlogfile via AJAX call
...@@ -31,7 +29,6 @@ ...@@ -31,7 +29,6 @@
// If the user is scrolled to the bottom, make sure they // If the user is scrolled to the bottom, make sure they
// stay scrolled to the bottom after appending. // stay scrolled to the bottom after appending.
var shouldScroll = (document.body.scrollHeight - window.scrollY === window.innerHeight); var shouldScroll = (document.body.scrollHeight - window.scrollY === window.innerHeight);
console.log(document.body.scrollHeight, window.scrollY, window.innerHeight);
$('pre').append(_.escape(newText)); $('pre').append(_.escape(newText));
if (shouldScroll) if (shouldScroll)
{ {
......
...@@ -34,7 +34,7 @@ $anonopt = ($this_user ? "" : "-a"); ...@@ -34,7 +34,7 @@ $anonopt = ($this_user ? "" : "-a");
# Verify page arguments. # Verify page arguments.
# #
$reqargs = RequiredPageArguments("logfile", PAGEARG_LOGFILE); $reqargs = RequiredPageArguments("logfile", PAGEARG_LOGFILE);
$optargs = OptionalPageArguments("asajax", PAGEARG_BOOLEAN); $optargs = OptionalPageArguments("isajax", PAGEARG_BOOLEAN);
if (! isset($logfile)) { if (! isset($logfile)) {
PAGEARGERROR("Must provide either a logfile ID"); PAGEARGERROR("Must provide either a logfile ID");
...@@ -49,7 +49,7 @@ $logfileid = $logfile->logid(); ...@@ -49,7 +49,7 @@ $logfileid = $logfile->logid();
# return an HTML fragment that requests this page again, but as # return an HTML fragment that requests this page again, but as
# an ajax request, so that the client gets periodic updates. # an ajax request, so that the client gets periodic updates.
# #
if (!isset($asajax) && $logfile->isopen()) { if (!isset($isajax) && $logfile->isopen()) {
header("Content-type: text/html; charset=utf-8"); header("Content-type: text/html; charset=utf-8");
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
......
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