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

diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html
index 3d98a68..57260ad 100644 (file)
--- a/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@ -65,7 +65,7 @@
 
     </script>
 
-<h2>MKWS Jasmine regression tests</h2>
+    <h2>MKWS Jasmine regression tests</h2>
 
     <div class="mkwsSearch"></div>
     <div class="mkwsPopup" popup_width="990" popup_height="760" popup_modal="0" popup_autoOpen="0" popup_button="input.mkwsButton">

diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index 7b32c1c..81ef2fc 100644 (file)
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -65,7 +65,8 @@
     };
     </script>
 
-<h2>MKWS Jasmine regression tests</h2>
+
+    <h2>MKWS Jasmine regression tests</h2>
     <div class="mkwsSearch"></div>
     <div class="mkwsPopup" popup_width="990" popup_height="760" popup_modal="0" popup_autoOpen="0" popup_button="input.mkwsButton">
       <div class="mkwsSwitch"></div>
@@ -75,6 +76,5 @@
       <div class="mkwsStat"></div>
     </div>
 
-
   </body>
 </html>

diff --git a/test/spec/mkws-pazpar2.js b/test/spec/mkws-pazpar2.js
index 10f3336..9a05f53 100644 (file)
--- a/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@ -728,7 +728,7 @@ describe("Check SortBy options", function () {
     });
 });
 
-describe("Check async widget discovery", function () {
+xdescribe("Check async widget discovery", function () {
   var $ = mkws.$;
   it("initialises a new widget", function() {
     $("div.mkwsSearch").after('<div id="asyncSearch"><div id="asyncSearch" class="mkwsSearch mkwsTeam_async"></div></div>');