Mercurial > hg > fapweb
changeset 992:5d04bd1a7a10
Merge.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sun, 30 Nov 2014 03:15:25 +0200 |
parents | 0a8cb8f9f555 (diff) 3e9e0aa21a18 (current diff) |
children | fbc2e6514dfa |
files | |
diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/admin.js Sun Nov 30 03:12:53 2014 +0200 +++ b/admin.js Sun Nov 30 03:15:25 2014 +0200 @@ -624,9 +624,9 @@ if (patch == 0) { - jsConfirmBox("Are you <b>sure</b> you want to delete and regenerate entry show positions "+ + jsConfirmBox("Are you <b>ABSOLUTELY CERTAIN</b> you want to delete and regenerate entry show positions "+ (id == 0 ? "for ALL compos" : "for this compo") +"? "+ - "<b>This will completely annihilate current show position numbers!</b>", mcb_ok, 0, 0); + "<b>This will completely annihilate current show position numbers! AND FUCK UP YOUR EXPORTED FILE ORDER (ask ccr to know what that means.)</b>", mcb_ok, 0, 0); } else mcb_ok(0);
--- a/show.php Sun Nov 30 03:12:53 2014 +0200 +++ b/show.php Sun Nov 30 03:15:25 2014 +0200 @@ -98,7 +98,7 @@ viewChanged(); if (!timeOutSet) { - setTimeout("tickMain();", 500); + setTimeout("tickMain();", 250); timeOutSet = true; } } @@ -106,7 +106,7 @@ { if (!timeOutSet) { - setTimeout("tickMain();", 1000); + setTimeout("tickMain();", 500); timeOutSet = true; } }