X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=examples%2Fhtdocs%2Fjasmine-popup.html;h=586b2623e5238780cbca8966af6cdb4b841a376a;hb=6cba1240099271c998511cb2bbf607ebe7aed7fc;hp=6c44a0979a9da8d71c7c8b4bc60b390a43c9ce15;hpb=52284cfd65160ea577892581fa0a030c96d270e1;p=mkws-moved-to-github.git

diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index 6c44a09..586b262 100644
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -10,13 +10,12 @@
     <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
     <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
     <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v2.0.0.js"></script>
 
     <script type="text/javascript" src="src/mkws-handlebars.js"></script>
     <script type="text/javascript" src="src/mkws-core.js"></script>
     <script type="text/javascript" src="src/mkws-team.js"></script>
     <script type="text/javascript" src="src/mkws-filter.js"></script>
-    <script type="text/javascript" src="src/mkws-popup.js"></script>
     <script type="text/javascript" src="src/mkws-widget.js"></script>
     <script type="text/javascript" src="src/mkws-widget-main.js"></script>
     <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
@@ -26,6 +25,8 @@
     <script type="text/javascript" src="src/mkws-widget-record.js"></script>
     <script type="text/javascript" src="src/mkws-widget-reference.js"></script>
     <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
+    <script type="text/javascript" src="src/mkws-templates.js"></script>
+    <script type="text/javascript" src="src/mkws-popup.js"></script>
 
     <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
     <link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-1.3.1/jasmine.css">
@@ -37,9 +38,7 @@
     <script type="text/javascript" src="test/spec/mkws-pazpar2.js"></script>
 
     <script type="text/javascript" src="test/js/mkws-jasmine-run.js"></script>
-    <script type="text/javascript"> mkws_jasmine_init(500); </script>
-
-    <!-- jquery null test 
+    <!-- jquery null test
     <script type="text/javascript">$ = undefined;</script>
 	-->
 
@@ -54,8 +53,7 @@
     // use a our main service proxy with mkws test account
     var mkws_config = {
       perpage_default: 10,
-      pazpar2_url:          "//mkws.indexdata.com/service-proxy/",
-      service_proxy_auth:   "//mkws.indexdata.com/service-proxy-testauth"
+      sp_auth_credentials: "mkwstest/mkwstest"
     };
 
     var jasmine_config = {
@@ -65,16 +63,18 @@
       check_motd: false,
       show_record_url: true
     };
-
-    jQuery.pazpar2({
-        "layout": "popup",               /* "table" [default], "div", "popup" */
-        "width": 990,                    /* popup width, should be at least 800 */
-        "height": 760                    /* popup height, should be at least 600 */
-    });
     </script>
 
-<h2>MKWS Jasmine regression tests</h2>
-<p/>
+
+    <h2>MKWS Jasmine regression tests</h2>
+    <div class="mkws-search"></div>
+    <div class="mkws-popup" popup_width="990" popup_height="760" popup_modal="0" popup_autoOpen="0" popup_button="input.mkws-button">
+      <div class="mkws-switch"></div>
+      <div class="mkws-lang"></div>
+      <div class="mkws-results"></div>
+      <div class="mkws-targets"></div>
+      <div class="mkws-stat"></div>
+    </div>
 
   </body>
 </html>