From: Mike Taylor <mike@indexdata.com>
Date: Thu, 19 Dec 2013 13:30:59 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 0.9.1~7
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=e65dff0d6a1b0e01e2a8cba8227066da7def735e;hp=15c7ed26ac8acae67829b1643e89a87df49407b5;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
---

diff --git a/test/Makefile b/test/Makefile
index a4b0389..ec1fd0c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -23,4 +23,5 @@ node_modules:
 	npm install jquery jsdom request jasmine-node
 
 help:
-	@echo "make [ all | clean | check | jsbeautifier | node-modules ]"
+	@echo "make [ all | check | clean | distclean ]"
+	@echo "     [ jsbeautifier | node-modules ]"
diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 626b7bd..ad18fba 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -53,7 +53,7 @@ mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLE
 	    echo ""; \
 	    exit 1; \
 	fi
-	( echo "/* Copyright (c) 2013 IndexData ApS. http://indexdata.com"; \
+	( echo "/*! Copyright (c) 2013 IndexData ApS. http://indexdata.com"; \
 	  echo "   created at: $$(date)"; \
 	  echo "   mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,')"; \
 	  echo "   $$(basename ${PZ2API_JS}) GIT id: $$(cd $$(dirname ${PZ2API_JS}) && git log $$(basename ${PZ2API_JS}) | head -n 1 | perl -npe 's,\S+\s+,,')"; \
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index cb3e973..8b40745 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -1,4 +1,4 @@
-/* MKWS, the MasterKey Widget Set. Copyright (C) 2013, Index Data */
+/*! MKWS, the MasterKey Widget Set. Copyright (C) 2013, Index Data */
 
 "use strict"; // HTML5: disable for debug_level >= 2
 
@@ -88,7 +88,7 @@ mkws.debug_function = function (string) {
     }
 
     var now = $.now();
-    var timestamp = (now - mkws.debug_time.start)/1000 + " (+" + (now - mkws.debug_time.last)/1000 + ") "
+    var timestamp = ((now - mkws.debug_time.start)/1000).toFixed(3) + " (+" + ((now - mkws.debug_time.last)/1000).toFixed(3) + ") "
     mkws.debug_time.last = now;
 
     // you need to disable use strict at the top of the file!!!