summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/tpl/vnedit3
-rw-r--r--lib/ChangeLog2
-rw-r--r--static/files/dyna.js6
3 files changed, 8 insertions, 3 deletions
diff --git a/data/tpl/vnedit b/data/tpl/vnedit
index cef90151..70bf09a5 100644
--- a/data/tpl/vnedit
+++ b/data/tpl/vnedit
@@ -101,7 +101,8 @@
* Screenshots have to be in the native resolution of the game,<br />
* Remove any window borders and make sure the image is unmarked,<br />
* Don't only upload event CGs.<br />
- Please read the <a href="/d2#6">guidelines</a> for more information.
+ Please read the <a href="/d2#6">guidelines</a> for more information.<br />
+ <b style="float: none; display: inline; font-weight: bold">Make sure to submit the form after the upload has finished!</b>
</span><br />
<div id="scrfrm" class="$p{st}">...make sure to enable Javascript...</div>
|},
diff --git a/lib/ChangeLog b/lib/ChangeLog
index c08da23a..3d15c225 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -11,6 +11,8 @@ TODO:
- Relation graph image maps are now stored in the DB
- Properly fixed the command synchronisation issues with Multi
- Fixed display of wrong ID in the screenshot diff
+ - Fixed bug with the infinite thumbnail generation message when the server
+ doesn't respond within one second.
1.21 - 2008-08-16 (r90)
- Added !vn and !uptime commands to Multi::IRC
diff --git a/static/files/dyna.js b/static/files/dyna.js
index 957cbc3c..b711fec2 100644
--- a/static/files/dyna.js
+++ b/static/files/dyna.js
@@ -608,7 +608,6 @@ function scrLoad() {
scrGenerateTR(i);
setTimeout(scrSetSubmit, 1000);
- setInterval(scrCheckStatus, 1000);
scrCheckStatus();
}
@@ -739,7 +738,8 @@ function scrCheckStatus() {
if(scrL[i] && scrL[i].load == 2)
ids+=(ids?';':'')+'id='+scrL[i].id;
if(!ids)
- return;
+ return setTimeout(scrCheckStatus, 1000);
+ var ti = setTimeout(scrCheckStatus, 10000);
ajax('/xml/screenshots.xml?'+ids+';r='+(Math.floor(Math.random()*999)+1), function () {
if(!hr || hr.readyState != 4 || !hr.responseText)
return;
@@ -759,6 +759,8 @@ function scrCheckStatus() {
scrSer();
}
}
+ clearTimeout(ti);
+ setTimeout(scrCheckStatus, 1000);
});
}