From: Heikki Levanto <heikki@indexdata.dk>
Date: Fri, 7 Mar 2014 12:45:36 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 1.0.0~1318^2~26
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=64b41a1411996e44a840dc3568f2d25ae83853f7;p=mkws-moved-to-github.git

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

Conflicts:
	test/spec/mkws-pazpar2.js
---

64b41a1411996e44a840dc3568f2d25ae83853f7
diff --cc test/spec/mkws-pazpar2.js
index 104a606,6643791..e459931
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@@ -313,7 -313,11 +313,6 @@@ describe("Show record", function () 
      var record_number = 1; // the Nth record in hit list
      it("show record author", function () {
          $("div.mkwsRecords div.record:nth-child(" + record_number + ") a").trigger("click");
- 
 -/*      debug("### click=" + typeof(click) + " " + click );
 -        debug("### len=" + click.length );
 -        debug("show record click is success: " + click.length);
 -        expect(click.length).toBe(1);
 -*/
          // wait until the record pops up
          waitsFor(function () {
              var show = $("div.mkwsRecords div.record:nth-child(" + record_number + ") div");