From 98494f3cb01f9146e1941f59214b5259df713f9a Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Thu, 23 Apr 2015 16:03:48 +0200
Subject: [PATCH] Fixed time for "draft saved" display, save draft every 10
 seconds.

---
 checklist.txt  |  2 +-
 scripts/dnd.js |  2 +-
 src/elogd.c    | 24 ++++++++++++------------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/checklist.txt b/checklist.txt
index 6d1fa43c..2c45d82a 100755
--- a/checklist.txt
+++ b/checklist.txt
@@ -11,7 +11,7 @@ On Mac (MPC1865):
 - "make loc"
 - Translate new strings in eloglang.german
 - "git commit -a -m "Release x.x.x-y"
-- Mege master into develop branch
+- Merge master into develop branch
 
 On VMPC1865 (VmWare):
 
diff --git a/scripts/dnd.js b/scripts/dnd.js
index dd4bd173..bba8d03d 100644
--- a/scripts/dnd.js
+++ b/scripts/dnd.js
@@ -46,7 +46,7 @@ function asend() {
           e1 = document.getElementById('saved1');
           e1.style.display = 'inline';
           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.innerHTML = e1.innerHTML;
           e2.style.display = 'inline';
diff --git a/src/elogd.c b/src/elogd.c
index 601639cc..244f408f 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -9981,6 +9981,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
          rsprintf("var entry_modified = false;\n");
    } else
       rsprintf("var entry_modified = false;\n");
+   rsprintf("var draft_modified = false;\n");
    rsprintf("var last_key = 0;\n\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("    clearTimeout(autoSaveTimer);\n");
    rsprintf("  asend();\n");
+   rsprintf("  draft_modified = false;\n");
    rsprintf("  return false;\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 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)))
       autosave = atoi(str);
    else
       autosave = 10;
-       
+
+   rsprintf("function mod(e)\n");
+   rsprintf("{\n");
    if (autosave) {
-      rsprintf("  if (autoSaveTimer != null)\n");
-      rsprintf("    clearTimeout(autoSaveTimer);\n");
-      rsprintf("  autoSaveTimer = setTimeout(save_draft, %d);\n", autosave*1000);
+      rsprintf("  if (!draft_modified)\n");
+      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("function checkText()\n");