From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 16 Apr 2014 15:26:34 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~621^2~26
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=841726a9de1a59357270f33148e37255aa2e4486;hp=ca452bc42c8f645cebb4d70f9be0b2864037118c;p=mkws-moved-to-github.git

Merge remote branch 'origin/master' into wosch
---

diff --git a/src/mkws-jquery.js b/src/mkws-jquery.js
index 0756d54..2f79db4 100644
--- a/src/mkws-jquery.js
+++ b/src/mkws-jquery.js
@@ -20,7 +20,7 @@ function _mkws_jquery_plugin($) {
 	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";
+	var id_popup = config.id_popup || ".mkwsPopup";
 
 	debug("popup height: " + height + ", width: " + width);
 
@@ -57,30 +57,30 @@ function _mkws_jquery_plugin($) {
 
 	// service-proxy or pazpar2
 	pazpar2: function(config) {
-	    if (config == null || typeof config != 'object') { 
+	    if (config == null || typeof config != 'object') {
 		config = {};
 	    }
-	    var id_popup = config.id_popup || "#mkwsPopup";
-	    id_popup = id_popup.replace(/^#/, "");
+	    var id_popup = config.id_popup || ".mkwsPopup";
+	    id_popup = id_popup.replace(/^[#\.]/, "");
 
 	    // simple layout
 	    var div = '\
-<div id="mkwsSwitch"></div>\
-<div id="mkwsLang"></div>\
-<div id="mkwsSearch"></div>\
-<div id="mkwsResults"></div>\
-<div id="mkwsTargets"></div>\
-<div id="mkwsStat"></div>';
+<div class="mkwsSwitch"></div>\
+<div class="mkwsLang"></div>\
+<div class="mkwsSearch"></div>\
+<div class="mkwsResults"></div>\
+<div class="mkwsTargets"></div>\
+<div class="mkwsStat"></div>';
 
 	    // new table layout
 	    var table = '\
 <style type="text/css">\
-  #mkwsTermlists div.facet {\
+  .mkwsTermlists div.facet {\
   float:left;\
   width: 30%;\
   margin: 0.3em;\
   }\
-  #mkwsStat {\
+  .mkwsStat {\
   text-align: right;\
   }\
 </style>\
@@ -88,44 +88,44 @@ function _mkws_jquery_plugin($) {
 <table width="100%" border="0">\
   <tr>\
     <td>\
-      <div id="mkwsSwitch"></div>\
-      <div id="mkwsLang"></div>\
-      <div id="mkwsSearch"></div>\
+      <div class="mkwsSwitch"></div>\
+      <div class="mkwsLang"></div>\
+      <div class="mkwsSearch"></div>\
     </td>\
   </tr>\
   <tr>\
     <td>\
       <div style="height:500px; overflow: auto">\
-	<div id="mkwsPager"></div>\
-	<div id="mkwsNavi"></div>\
-	<div id="mkwsRecords"></div>\
-	<div id="mkwsTargets"></div>\
-	<div id="mkwsRanking"></div>\
+	<div class="mkwsPager"></div>\
+	<div class="mkwsNavi"></div>\
+	<div class="mkwsRecords"></div>\
+	<div class="mkwsTargets"></div>\
+	<div class="mkwsRanking"></div>\
       </div>\
     </td>\
   </tr>\
   <tr>\
     <td>\
       <div style="height:300px; overflow: hidden">\
-	<div id="mkwsTermlists"></div>\
+	<div class="mkwsTermlists"></div>\
       </div>\
     </td>\
   </tr>\
   <tr>\
     <td>\
-      <div id="mkwsStat"></div>\
+      <div class="mkwsStat"></div>\
     </td>\
   </tr>\
 </table>';
 
 	    var popup = '\
-<div id="mkwsSearch"></div>\
-<div id="' + id_popup + '">\
-  <div id="mkwsSwitch"></div>\
-  <div id="mkwsLang"></div>\
-  <div id="mkwsResults"></div>\
-  <div id="mkwsTargets"></div>\
-  <div id="mkwsStat"></div>\
+<div class="mkwsSearch"></div>\
+<div class="' + id_popup + '">\
+  <div class="mkwsSwitch"></div>\
+  <div class="mkwsLang"></div>\
+  <div class="mkwsResults"></div>\
+  <div class="mkwsTargets"></div>\
+  <div class="mkwsStat"></div>\
 </div>'
 
 	    if (config && config.layout == 'div') {
diff --git a/test/logs/.gitignore b/test/logs/.gitignore
index e0cbaa1..e69de29 100644
--- a/test/logs/.gitignore
+++ b/test/logs/.gitignore
@@ -1,5 +0,0 @@
-error_log
-jasmine-dev
-mkws-jasmine-access.log
-mkws-jasmine-error.log
-mkws-jasmine-rewrite.log
diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 483bac7..9ae28d3 100644
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -285,13 +285,13 @@ describe("Check Author Facets", function () {
 describe("Check active clients author", function () {
     it("check for active clients after limited author search", function () {
         waitsFor(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             //debug("clients: " + clients.text());
             return clients.length == 1 && clients.text().match("/[1-9]+[0-9]+$");
         }, "wait for Active clients: x/y", 5 * jasmine_config.second);
 
         runs(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("span.clients: " + clients.text());
             expect(clients.text()).toMatch("/[1-9]+[0-9]+$");
 
@@ -385,13 +385,13 @@ describe("Check record list", function () {
         }
 
         waitsFor(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             //debug("clients: " + clients.text());
             return clients.length == 1 && clients.text().match("/1$");
         }, "wait for Active clients: x/1", 5 * jasmine_config.second);
 
         runs(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("span.clients: " + clients.text());
             expect(clients.text()).toMatch("/1$");
         });
@@ -501,7 +501,7 @@ describe("Check status client counter", function () {
         }
 
         waitsFor(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("clients: " + clients.text());
             if (clients.length == 1 && clients.text().match("0/1$")) {
                 return true;
@@ -511,7 +511,7 @@ describe("Check status client counter", function () {
         }, "wait for Active clients: 0/1", 4 * jasmine_config.second);
 
         runs(function () {
-            var clients = $("div#mkwsStat span.clients");
+            var clients = $("div.mkwsStat span.clients");
             debug("span.clients: " + clients.text());
             expect(clients.text()).toMatch("0/1$");
         });