Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed time for "draft saved" display, save draft every 10 seconds.

Browse Source
This commit is contained in:
Stefan Ritt 2015-04-23 16:03:48 +02:00
parent 5be245e398
commit 98494f3cb0
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
checklist.txt
View File

@ -11,7 +11,7 @@ On Mac (MPC1865):
- "make loc" - "make loc"
- Translate new strings in eloglang.german - Translate new strings in eloglang.german
- "git commit -a -m "Release x.x.x-y" - "git commit -a -m "Release x.x.x-y"
- Mege master into develop branch - Merge master into develop branch
On VMPC1865 (VmWare): On VMPC1865 (VmWare):

2
scripts/dnd.js
View File

@ -46,7 +46,7 @@ function asend() {
e1 = document.getElementById('saved1'); e1 = document.getElementById('saved1');
e1.style.display = 'inline'; e1.style.display = 'inline';
s = e1.innerHTML.substring(0, e1.innerHTML.length-8); s = e1.innerHTML.substring(0, e1.innerHTML.length-8);
e1.innerHTML = s+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds(); e1.innerHTML = s+d.toTimeString().substring(0, 8);
e2 = document.getElementById('saved2'); e2 = document.getElementById('saved2');
e2.innerHTML = e1.innerHTML; e2.innerHTML = e1.innerHTML;
e2.style.display = 'inline'; e2.style.display = 'inline';

22
src/elogd.c
View File

@ -9981,6 +9981,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf("var entry_modified = false;\n"); rsprintf("var entry_modified = false;\n");
} else } else
rsprintf("var entry_modified = false;\n"); rsprintf("var entry_modified = false;\n");
rsprintf("var draft_modified = false;\n");
rsprintf("var last_key = 0;\n\n"); rsprintf("var last_key = 0;\n\n");
rsprintf("function chkform()\n"); rsprintf("function chkform()\n");
@ -10168,6 +10169,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf(" if (autoSaveTimer != null)\n"); rsprintf(" if (autoSaveTimer != null)\n");
rsprintf(" clearTimeout(autoSaveTimer);\n"); rsprintf(" clearTimeout(autoSaveTimer);\n");
rsprintf(" asend();\n"); rsprintf(" asend();\n");
rsprintf(" draft_modified = false;\n");
rsprintf(" return false;\n"); rsprintf(" return false;\n");
rsprintf("}\n\n"); rsprintf("}\n\n");
@ -10193,24 +10195,22 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf("var checkTextTimer;\n"); rsprintf("var checkTextTimer;\n");
rsprintf("var oldText;\n\n"); rsprintf("var oldText;\n\n");
rsprintf("function mod(e)\n");
rsprintf("{\n");
rsprintf(" entry_modified = true;\n");
rsprintf(" window.status = \"%s\";\n", loc("Entry has been modified"));
rsprintf(" document.form1.entry_modified.value = \"1\";\n");
rsprintf(" document.title = '%s - %s';\n", page_title, loc("Edited"));
if (getcfg(lbs->name, "Autosave", str, sizeof(str))) if (getcfg(lbs->name, "Autosave", str, sizeof(str)))
autosave = atoi(str); autosave = atoi(str);
else else
autosave = 10; autosave = 10;
rsprintf("function mod(e)\n");
rsprintf("{\n");
if (autosave) { if (autosave) {
rsprintf(" if (autoSaveTimer != null)\n"); rsprintf(" if (!draft_modified)\n");
rsprintf(" clearTimeout(autoSaveTimer);\n"); rsprintf(" autoSaveTimer = setTimeout(save_draft, %d);\n", autosave*1000);
rsprintf(" autoSaveTimer = setTimeout(save_draft, %d);\n", autosave*1000);
} }
rsprintf(" entry_modified = true;\n");
rsprintf(" draft_modified = true;\n");
rsprintf(" window.status = \"%s\";\n", loc("Entry has been modified"));
rsprintf(" document.form1.entry_modified.value = \"1\";\n");
rsprintf(" document.title = '%s - %s';\n", page_title, loc("Edited"));
rsprintf("}\n\n"); rsprintf("}\n\n");
rsprintf("function checkText()\n"); rsprintf("function checkText()\n");