From: Wolfram Schneider Date: Wed, 15 Oct 2014 19:57:32 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws X-Git-Tag: 1.0.0~192 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=24d51a4ad9f245450742bc51e3ee701ba0b86c07;hp=77156aa74121584e07e539308ca35ed3df0b551c;p=mkws-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws --- diff --git a/Makefile b/Makefile index 322bd9e..c623650 100644 --- a/Makefile +++ b/Makefile @@ -4,28 +4,27 @@ # export PATH=$PATH:/home/indexdata/node/node-v0.10.32-linux-x64/bin all: setup - ${MAKE} -C./test node-modules - ${MAKE} -C./tools/htdocs $@ - ${MAKE} -C./doc install + ${MAKE} -C./src + ${MAKE} -C./doc + ${MAKE} -C./examples/htdocs clean distclean: - ${MAKE} -C./tools/htdocs $@ + ${MAKE} -C./src $@ ${MAKE} -C./doc $@ ${MAKE} -C./examples/htdocs $@ ${MAKE} -C./test $@ +check: setup check-js phantomjs + +setup: + ${MAKE} -C./test node-modules + check-js: ${MAKE} -C./test check phantomjs p p-all phantomjs-all jsb: ${MAKE} -C./test $@ -# must be called once after GIT checkout -setup: - ${MAKE} -C./test node-modules - -check: setup check-js phantomjs - help: @echo "make [ all | setup | clean | distclean ]" @echo " [ check | check-js | phantomjs ]" diff --git a/doc/Makefile b/doc/Makefile index f65d44a..461a904 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -40,6 +40,9 @@ clean: rm -f $(INSTALLED) rm -f *.drupal.html +distclean: clean + # Nothing more to remove in the doc directory + push: pandoc --toc index.markdown > index.drupal.html pandoc --toc mkws-manual.markdown > mkws-manual.drupal.html diff --git a/src/Makefile b/src/Makefile index d44c596..9c1fa79 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,118 @@ -**default**: - make -C ../tools/htdocs +# Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com -clean: - make -C ../tools/htdocs clean +DEST = ../tools/htdocs + +HANDLEBARS_FILE = handlebars-v2.0.0.js +JQUERY_FILE = jquery-1.10.0.min.js +JQUERY_JSON_FILE = jquery.json-2.4.js +PP2_FILE = pz2.js + +HANDLEBARS_URL = http://builds.handlebarsjs.com.s3.amazonaws.com/${HANDLEBARS_FILE} +JQUERY_URL = http://code.jquery.com/${JQUERY_FILE} +JQUERY_JSON_URL = https://jquery-json.googlecode.com/files/${JQUERY_JSON_FILE} +PP2_URL = http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/${PP2_FILE};hb=HEAD + +VERSION = $(shell tr -d '\012' < VERSION) +HANDLEBARS = ../test/node_modules/.bin/handlebars +YUI_COMPRESSOR = $(shell which yui-compressor ../../test/bin/yui-compressor | head -1) + +COMPONENTS = mkws-handlebars.js \ + mkws-core.js \ + mkws-team.js \ + mkws-filter.js \ + mkws-widget.js \ + mkws-widget-main.js \ + mkws-widget-termlists.js \ + mkws-widget-authname.js \ + mkws-widget-categories.js \ + mkws-widget-log.js \ + mkws-widget-record.js \ + mkws-widget-reference.js \ + mkws-widget-builder.js \ + mkws-templates.js \ + mkws-popup.js + +DOWNLOADABLE = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} +RELEASABLE = mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js +AVAILABLE = $(DOWNLOADABLE) $(RELEASABLE) mkws-jquery.js NEWS VERSION +INSTALLED_DOWNLOADABLE = $(DOWNLOADABLE:%=$(DEST)/%) +INSTALLED_RELEASABLE = $(RELEASABLE:%=$(DEST)/%) +INSTALLED = $(AVAILABLE:%=$(DEST)/%) + +all: $(INSTALLED) + +$(DEST)/mkws-complete.js: Makefile $(INSTALLED_DOWNLOADABLE) $(DEST)/mkws.js + ( set -e; \ + echo "/*! Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com"; \ + echo " Licence: LGPL, http://www.indexdata.com/licences/lgpl"; \ + echo " created at: $$(date)"; \ + echo " MKWS GIT id: $$(git show | head -n 1 | perl -npe 's,\S+\s+,,')"; \ + echo " pz2.js GIT id: $$(curl -sSf 'http://git.indexdata.com/?p=pazpar2.git;a=rss' | egrep ',')"; \ + echo "*/"; \ + cat $(DEST)/${JQUERY_FILE}; \ + cat $(DEST)/${JQUERY_JSON_FILE}; \ + echo 'mkws_jQuery = jQuery.noConflict(true);'; \ + cat $(DEST)/${HANDLEBARS_FILE}; \ + cat $(DEST)/${PP2_FILE}; \ + cat $(DEST)/mkws.js; \ + ) > $@.tmp + mv -f $@.tmp $@ + +%.min.js: %.js + ${YUI_COMPRESSOR} $? > $@.tmp + mv -f $@.tmp $@ + +$(DEST)/${HANDLEBARS_FILE}: + curl -sSf ${HANDLEBARS_URL} -o $@.tmp + mv -f $@.tmp $@ + +$(DEST)/${JQUERY_FILE}: + curl -sSf ${JQUERY_URL} -o $@.tmp + perl -npe 's,sourceMappingURL=jquery.*map,,' $@.tmp > $@ + rm -f $@.tmp + +$(DEST)/${JQUERY_JSON_FILE}: + curl -sSf ${JQUERY_JSON_URL} -o $@.tmp + mv -f $@.tmp $@ + +$(DEST)/${PP2_FILE}: + curl -sSf "${PP2_URL}" -o $@.tmp + mv -f $@.tmp $@ + +$(DEST)/%: % + rm -f $@ + cp $? $@ + chmod 444 $@ + +release: $(RELEASABLE) + @if [ -f ${DEST}/releases/mkws-$(VERSION).js ]; then \ + echo "*** There is already a release $(VERSION)"; \ + else \ + cp -p $(DEST)/mkws.js ${DEST}/releases/mkws-$(VERSION).js; \ + cp -p $(DEST)/mkws.min.js ${DEST}/releases/mkws-$(VERSION).min.js; \ + cp -p $(DEST)/mkws-complete.js ${DEST}/releases/mkws-complete-$(VERSION).js; \ + cp -p $(DEST)/mkws-complete.min.js ${DEST}/releases/mkws-complete-$(VERSION).min.js; \ + echo "Made release $(VERSION)"; \ + fi + +$(DEST)/mkws.js: $(COMPONENTS) Makefile + cat ${COMPONENTS} > $@.tmp + mv -f $@.tmp $@ + chmod 444 $@ + +mkws-templates.js: *.templates/*.handlebars + ${HANDLEBARS} -n mkws.defaultTemplates *.templates/*.handlebars -f $@.tmp + mv -f $@.tmp $@ + +# Checks that the JavaScript can be parsed +syntax-check: $(DEST)/mkws.js + ${YUI_COMPRESSOR} $(DEST)/mkws.js >/dev/null + +# Emits a list of \n}' + +clean distclean: + rm -f ${INSTALLED} diff --git a/src/mkws-jquery.js b/src/mkws-jquery.js new file mode 100644 index 0000000..73bd406 --- /dev/null +++ b/src/mkws-jquery.js @@ -0,0 +1,148 @@ +/*! jQuery plugin for MKWS, the MasterKey Widget Set. + * Copyright (C) 2013-2014 Index Data + * See the file LICENSE for details + */ + +"use strict"; + + +/* + * implement jQuery plugin $.pazpar2({}) + */ +function _mkws_jquery_plugin($) { + function debug(string) { + mkws.log("jQuery.pazpar2: " + string); + } + + function init_popup(obj) { + var config = obj ? obj : {}; + + var height = config.height || 760; + var width = config.width || 880; + var id_button = config.id_button || "input.mkwsButton"; + var id_popup = config.id_popup || ".mkwsPopup"; + + debug("popup height: " + height + ", width: " + width); + + // make sure that jquery-ui was loaded afte jQuery core lib, e.g.: + // + if (!$.ui) { + debug("Error: jquery-ui.js is missing, did you include it after jQuery core in the HTML file?"); + return; + } + + $(id_popup).dialog({ + closeOnEscape: true, + autoOpen: false, + height: height, + width: width, + modal: true, + resizable: true, + buttons: { + Cancel: function() { + $(this).dialog("close"); + } + }, + close: function() { } + }); + + $(id_button) + .button() + .click(function() { + $(id_popup).dialog("open"); + }); + }; + + $.extend({ + + // service-proxy or pazpar2 + pazpar2: function(config) { + if (config == null || typeof config != 'object') { + config = {}; + } + var id_popup = config.id_popup || ".mkwsPopup"; + id_popup = id_popup.replace(/^[#\.]/, ""); + + // simple layout + var div = '\ +
\ +
\ +
\ +
\ +
\ +
'; + + // new table layout + var table = '\ +\ + \ +\ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
'; + + var popup = '\ +
\ +
\ +
\ +
\ +
\ +
\ +
\ +
' + + if (config && config.layout == 'div') { + debug("jquery plugin layout: div"); + document.write(div); + } else if (config && config.layout == 'popup') { + debug("jquery plugin layout: popup with id: " + id_popup); + document.write(popup); + $(document).ready(function() { init_popup(config); }); + } else { + debug("jquery plugin layout: table"); + document.write(table); + } + } + }); +}; + + +// enable before page load, so we could call it before mkws() runs +_mkws_jquery_plugin(jQuery); diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js index 2f5b5ab..274e45f 100644 --- a/test/spec/mkws-pazpar2.js +++ b/test/spec/mkws-pazpar2.js @@ -676,7 +676,7 @@ describe("Check SortBy options", function () { var list = []; var terms = $("div.mkwsRecords > div.mkwsSummary > a"); for (var i = 0; i < terms.length; i++) { - var term = $(terms[i]).text(); + var term = $(terms[i]).text().trim(); list.push(term); // debug(prefix + "title: " + term); } @@ -716,7 +716,7 @@ describe("Check SortBy options", function () { var title_list_new = title_list("yyy "); var diff_flag = 0; for (var i = 0; i < title_list_old.length; i++) { - debug(title_list_old[i] + " :: " + title_list_new[i]); + debug((i+1) + ". " + title_list_old[i] + " :: " + title_list_new[i]); if (title_list_old[i] != title_list_new[i]) { diff_flag++; diff --git a/tools/htdocs/.gitignore b/tools/htdocs/.gitignore index ec8964f..fad4014 100644 --- a/tools/htdocs/.gitignore +++ b/tools/htdocs/.gitignore @@ -4,15 +4,15 @@ mkws-developer.html index.pdf mkws-manual.pdf mkws-developer.pdf +mkws-doc.css NEWS VERSION handlebars-v2.0.0.js jquery-1.10.0.min.js jquery.json-2.4.js +pz2.js +mkws.js mkws-complete.js +mkws.min.js mkws-complete.min.js -mkws-doc.css mkws-jquery.js -mkws.js -mkws.min.js -pz2.js diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile deleted file mode 100644 index c08f23c..0000000 --- a/tools/htdocs/Makefile +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com - -SRC= ../../src - -HANDLEBARS_FILE = handlebars-v2.0.0.js -JQUERY_FILE = jquery-1.10.0.min.js -JQUERY_JSON_FILE = jquery.json-2.4.js -PP2_FILE = pz2.js - -HANDLEBARS_URL = http://builds.handlebarsjs.com.s3.amazonaws.com/${HANDLEBARS_FILE} -JQUERY_URL = http://code.jquery.com/${JQUERY_FILE} -JQUERY_JSON_URL = https://jquery-json.googlecode.com/files/${JQUERY_JSON_FILE} -PP2_URL = http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/${PP2_FILE};hb=HEAD - -JQUERY_UI_URL = http://code.jquery.com/ui/1.10.3/jquery-ui.js -VERSION = $(shell tr -d '\012' < ${SRC}/VERSION) -#HANDLEBARS=handlebars -HANDLEBARS=../../test/node_modules/.bin/handlebars -YUI_COMPRESSOR= $(shell which yui-compressor ../../test/bin/yui-compressor | head -1) - -COMPONENTS = ${SRC}/mkws-handlebars.js \ - ${SRC}/mkws-core.js \ - ${SRC}/mkws-team.js \ - ${SRC}/mkws-filter.js \ - ${SRC}/mkws-widget.js \ - ${SRC}/mkws-widget-main.js \ - ${SRC}/mkws-widget-termlists.js \ - ${SRC}/mkws-widget-authname.js \ - ${SRC}/mkws-widget-categories.js \ - ${SRC}/mkws-widget-log.js \ - ${SRC}/mkws-widget-record.js \ - ${SRC}/mkws-widget-reference.js \ - ${SRC}/mkws-widget-builder.js \ - ${SRC}/mkws-templates.js \ - ${SRC}/mkws-popup.js - -GENERATED = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \ - mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js ${SRC}/mkws-templates.js - -**make-default**: all - -all: mkws.min.js mkws-complete.min.js - -mkws-js mkws-complete.js: Makefile mkws.js ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} - ( set -e; \ - echo "/*! Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com"; \ - echo " Licence: GPL, http://www.indexdata.com/licences/gpl"; \ - echo " created at: $$(date)"; \ - echo " MKWS GIT id: $$(git show | head -n 1 | perl -npe 's,\S+\s+,,')"; \ - echo " pz2.js GIT id: $$(curl -sSf 'http://git.indexdata.com/?p=pazpar2.git;a=rss' | egrep ',')"; \ - echo "*/"; \ - cat ${JQUERY_FILE}; \ - cat ${JQUERY_JSON_FILE}; \ - echo 'mkws_jQuery = jQuery.noConflict(true);'; \ - cat ${HANDLEBARS_FILE}; \ - cat ${PP2_FILE}; \ - cat mkws.js; \ - ) > mkws-complete.js.tmp - mv -f mkws-complete.js.tmp mkws-complete.js - -%.min.js: %.js - ${YUI_COMPRESSOR} $? > $@.tmp - mv -f $@.tmp $@ - -mkws-syntax-check: - ${YUI_COMPRESSOR} mkws.js >/dev/null - -${HANDLEBARS_FILE}: - curl -sSf ${HANDLEBARS_URL} -o $@.tmp - mv -f $@.tmp $@ - -${JQUERY_FILE}: - curl -sSf ${JQUERY_URL} -o $@.tmp - perl -npe 's,sourceMappingURL=jquery.*map,,' $@.tmp > $@ - rm -f $@.tmp - -${JQUERY_JSON_FILE}: - curl -sSf ${JQUERY_JSON_URL} -o $@.tmp - mv -f $@.tmp $@ - -${PP2_FILE}: - curl -sSf "${PP2_URL}" -o $@.tmp - mv -f $@.tmp $@ - -release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js - @if [ -f ${SRC}/releases/mkws-$(VERSION).js ]; then \ - echo "*** There is already a release $(VERSION)"; \ - else \ - cp -p mkws.js ${SRC}/releases/mkws-$(VERSION).js; \ - cp -p mkws.min.js ${SRC}/releases/mkws-$(VERSION).min.js; \ - cp -p mkws-complete.js ${SRC}/releases/mkws-complete-$(VERSION).js; \ - cp -p mkws-complete.min.js ${SRC}/releases/mkws-complete-$(VERSION).min.js; \ - echo "Made release $(VERSION)"; \ - fi - -mkws.js: $(COMPONENTS) Makefile - rm -f $@ - cat ${COMPONENTS} > $@.tmp - mv -f $@.tmp $@ - chmod 444 $@ - -${SRC}/mkws-templates.js: ${SRC}/*.templates/*.handlebars - ${HANDLEBARS} -n mkws.defaultTemplates ${SRC}/*.templates/*.handlebars -f $@.tmp - mv -f $@.tmp $@ - -mkws-html-includes: - echo $(COMPONENTS) | perl -npe "s,${SRC},,g; s/\s+/\0/g" | \ - perl -n0e 'chomp(); print qq{ \n}' - -distclean: clean - @echo "(No need for distclean, 'make clean' is fine)" - -clean: - rm -f ${GENERATED} - -help: - @echo "make [ all | release | clean | distclean ]" - @echo " [ mkws-syntax-check ]"