chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
74bee4e
)
journal: use localstorage instead of cookies in browse.html and store where the curre...
author
Lennart Poettering
<lennart@poettering.net>
Wed, 10 Oct 2012 22:38:20 +0000
(
00:38
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 10 Oct 2012 22:38:20 +0000
(
00:38
+0200)
src/journal/browse.html
patch
|
blob
|
history
diff --git
a/src/journal/browse.html
b/src/journal/browse.html
index 97fbcbf91db349beb40fd18ff12b2dffb1f1df7d..a49dcf243ed91277d8cc89db74e2f5a8c4d34cec 100644
(file)
--- a/
src/journal/browse.html
+++ b/
src/journal/browse.html
@@
-99,7
+99,6
@@
<body>
<!-- TODO:
- live display
<body>
<!-- TODO:
- live display
- - localstorage
- show red lines for reboots -->
<h1 id="title"></h1>
- show red lines for reboots -->
<h1 id="title"></h1>
@@
-138,33
+137,17
@@
var first_cursor = null;
var last_cursor = null;
var first_cursor = null;
var last_cursor = null;
- function setCookie(name, value, msec) {
- var d = new Date();
- d.setMilliseconds(d.getMilliseconds() + msec);
- var v = escape(value) + "; expires=" + d.toUTCString();
- document.cookie = name + "=" + value;
- }
-
- function getCookie(name) {
- var i, l;
- l = document.cookie.split(";");
- for (i in l) {
- var x, y, j;
- j = l[i].indexOf("=");
- x = l[i].substr(0, j);
- y = l[i].substr(j+1);
- if (x == name)
- return unescape(y);
- }
- return null;
- }
-
function getNEntries() {
var n;
function getNEntries() {
var n;
- n =
getCookie("n_entries")
;
+ n =
localStorage["n_entries"]
;
if (n == null)
return 50;
if (n == null)
return 50;
- return parseInt(n);
+ n = parseInt(n);
+ if (n < 10)
+ return 10;
+ if (n > 1000)
+ return 1000;
+ return n;
}
function showNEntries(n) {
}
function showNEntries(n) {
@@
-173,12
+156,7
@@
}
function setNEntries(n) {
}
function setNEntries(n) {
- if (n < 10)
- n = 10;
- else if (n > 1000)
- n = 1000;
-
- setCookie("n_entries", n.toString(), 30*24*60*60*1000);
+ localStorage["n_entries"] = n.toString();
showNEntries(n);
}
showNEntries(n);
}
@@
-237,6
+215,12
@@
}
function entriesLoad(range) {
}
function entriesLoad(range) {
+
+ if (range == null)
+ range = localStorage["cursor"];
+ if (range == null)
+ range = "";
+
var request = new XMLHttpRequest();
request.open("GET", "/entries");
request.onreadystatechange = entriesOnResult;
var request = new XMLHttpRequest();
request.open("GET", "/entries");
request.onreadystatechange = entriesOnResult;
@@
-333,7
+317,7
@@
else if (d.SYSLOG_PID != undefined)
buf += "[" + escapeHTML(d.SYSLOG_PID) + "]";
else if (d.SYSLOG_PID != undefined)
buf += "[" + escapeHTML(d.SYSLOG_PID) + "]";
- buf += '</td><td class="' + clazz + '"><a href="#entry" onclick="onMessageClick(\'' +
lc
+ '\');">';
+ buf += '</td><td class="' + clazz + '"><a href="#entry" onclick="onMessageClick(\'' +
d.__CURSOR
+ '\');">';
if (d.MESSAGE == null)
buf += "[blob data]";
if (d.MESSAGE == null)
buf += "[blob data]";
@@
-347,8
+331,10
@@
logs.innerHTML = '<tbody>' + buf + '</tbody>';
logs.innerHTML = '<tbody>' + buf + '</tbody>';
- if (fc != null)
+ if (fc != null)
{
first_cursor = fc;
first_cursor = fc;
+ localStorage["cursor"] = fc;
+ }
if (lc != null)
last_cursor = lc;
}
if (lc != null)
last_cursor = lc;
}
@@
-434,7
+420,7
@@
}
machineLoad();
}
machineLoad();
- entriesLoad(
""
);
+ entriesLoad(
null
);
showNEntries(getNEntries());
document.onkeyup = onKeyUp;
showNEntries(getNEntries());
document.onkeyup = onKeyUp;