Merge remote branch 'origin/master' into onload

diff --git a/test/Makefile b/test/Makefile
index a4b0389..ec1fd0c 100644 (file)
--- 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/.gitignore b/tools/htdocs/.gitignore
index 9ef368c..8928913 100644 (file)
--- a/tools/htdocs/.gitignore
+++ b/tools/htdocs/.gitignore
@@ -2,6 +2,8 @@ handlebars-v1.1.2.js
 jquery-1.10.0.min.js
 jquery.json-2.4.js
 mkws-complete.js
+mkws.min.js
+mkws-complete.min.js
 README.html
 README.odt
 README.pdf

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 89e543e..ad18fba 100644 (file)
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -17,6 +17,7 @@ JQUERY_UI_URL=        http://code.jquery.com/ui/1.10.3/jquery-ui.js
 #JQUERY_UI_URL=        http://code.jquery.com/ui/1.8.0/jquery-ui.min.js
 JQUERY_JSON_URL= https://jquery-json.googlecode.com/files/jquery.json-2.4.js
 HANDLEBARS_URL=        http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.2.js -o $@
+VERSION = $(shell tr -d '\012' < VERSION)
 
 MKWS_JS=       mkws-complete.js
 PZ2API_JS=     ../../../pazpar2/js/pz2.js
@@ -30,9 +31,10 @@ HANDLEBARS_FILE := $(shell basename ${HANDLEBARS_URL})
 DOCS = README.html README.odt README.pdf \
        whitepaper.html whitepaper.odt whitepaper.pdf
 
+# Default rule when "make" is invoked without a target
 **default**: ${MKWS_JS} README.html whitepaper.html
 
-all: ${MKWS_JS} $(DOCS)
+all: ${MKWS_JS} mkws-js-min $(DOCS)
 
 docs: $(DOCS)
 
@@ -41,7 +43,7 @@ pz2api-git-checkout:
            ( cd ../../.. && git clone ${PZ2API_GIT} ); \
        fi
 
-mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
+mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE}
        @if ! test -e ${PZ2API_JS}; then \
            echo "The pazpar2 JS file ${PZ2API_JS} does not exists."; \
            echo "Did you checked out the source from the git repo?"; \
@@ -51,7 +53,7 @@ mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_JSON_FILE} ${JQUERY_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+,,')"; \
@@ -64,17 +66,33 @@ mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLE
        ) > ${MKWS_JS}.new
        mv -f ${MKWS_JS}.new ${MKWS_JS}
 
-${JQUERY_JSON_FILE}:
-       curl -sSf ${JQUERY_JSON_URL} -o $@
+mkws-js-min: mkws.min.js mkws-complete.min.js
+
+%.min.js: %.js
+       yui-compressor $? > $@.new
+       mv -f $@.new $@
 
 ${JQUERY_FILE}:
        curl -sSf ${JQUERY_URL} -o $@.new
        perl -npe 's,sourceMappingURL=jquery.*map,,' $@.new > $@
        rm -f $@.new
 
+${JQUERY_JSON_FILE}:
+       curl -sSf ${JQUERY_JSON_URL} -o $@
+
 ${HANDLEBARS_FILE}:
        curl -sSf ${HANDLEBARS_URL} -o $@
 
+release: mkws.js mkws-complete.js mkws-complete.min.js
+       @if [ -f releases/mkws-$(VERSION).js ]; then \
+               echo "*** There is already a release $(VERSION)"; \
+       else \
+               cp -p mkws.js releases/mkws-$(VERSION).js; \
+               cp -p mkws.min.js releases/mkws-$(VERSION).min.js; \
+               cp -p mkws-complete.js releases/mkws-complete-$(VERSION).js; \
+               cp -p mkws-complete.min.js releases/mkws-complete-$(VERSION).min.js; \
+               echo "Made release $(VERSION)"; \
+       fi
 
 # For a description of pandoc's markdown format, see:
 # http://johnmacfarlane.net/pandoc/demo/example9/pandocs-markdown.html -->
@@ -104,14 +122,17 @@ ${HANDLEBARS_FILE}:
 # helper targets
 #
 distclean: clean
+       rm -f *.orig *.bak *.rej
+
 clean:
-       rm -f ${MKWS_JS} ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
+       rm -f ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE}
+       rm -f mkws.min.js ${MKWS_JS} mkws-complete.min.js
        rm -f $(DOCS)
 
 help:
-       @echo "make [ help | mkws-js | docs | clean ]"
+       @echo "make [ help | docs | clean ]"
+       @echo "     [ mkws-js | mkws-js-min ]"
        @echo ""
        @echo "make JQUERY_URL=http://code.jquery.com/jquery-2.0.3.min.js clean mkws-js"
        @echo ""
        @echo "Please check ./README file too!"
-

diff --git a/tools/htdocs/VERSION b/tools/htdocs/VERSION
new file mode 100644 (file)
index 0000000..f374f66
--- /dev/null
+++ b/tools/htdocs/VERSION
@@ -0,0 +1 @@
+0.9.1

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 0ed1a99..22230d0 100644 (file)
--- 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
 
@@ -87,7 +87,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!!!