X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=examples%2Fhtdocs%2Findex-jasmine.html;h=818123cce97e49c082697a28e2de07ba6720cd01;hb=6d4f8c27f3f9ed2cc7c1275613a51b52c11dffdb;hp=c63978b86826677a1ee9bd6695173a5d86c74dbf;hpb=2f0e94f2d0658db9189d6c6b0918c1a64572ac13;p=mkws-moved-to-github.git

diff --git a/examples/htdocs/index-jasmine.html b/examples/htdocs/index-jasmine.html
index c63978b..818123c 100644
--- a/examples/htdocs/index-jasmine.html
+++ b/examples/htdocs/index-jasmine.html
@@ -2,12 +2,11 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo: Wolfram's playground</title>
-    <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkwsStyle.css" />
+    <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
-	  switch_menu: false,
 	  /*
-	  service_proxy_url : "/service-proxy/",
+	  pazpar2_url : "/service-proxy/",
 	  service_proxy_auth : "/service-proxy-auth/",
 	  */
       };
@@ -26,47 +25,22 @@
       }
     </style>
 
-  <!-- jasmine -->
+  <!-- SECTION jasmine -->
     <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">
     <script type="text/javascript" src="../../../jasmine/lib/jasmine-1.3.1/jasmine.js"></script>
     <script type="text/javascript" src="../../../jasmine/lib/jasmine-1.3.1/jasmine-html.js"></script>
 
-    <!-- include source files here... -->
-    <script type="text/javascript" src="../../../jasmine/src/Player.js"></script>
-    <script type="text/javascript" src="../../../jasmine/src/Song.js"></script>
-
-    <!-- include spec files here... -->
-    <script type="text/javascript" src="../../../jasmine/spec/SpecHelper.js"></script>
-    <script type="text/javascript" src="../../../jasmine/spec/PlayerSpec.js"></script>
+    <!-- include MKWS spec files ... -->
+    <script type="text/javascript" src="../../test/spec/true.spec.js"></script>
+    <script type="text/javascript" src="../../test/spec/mkws-config.js"></script>
+    <script type="text/javascript" src="../../test/spec/mkws-pazpar2.js"></script>
 
+    <!-- init and run jasmine -->
+    <script type="text/javascript" src="../../test/js/mkws-jasmine-run.js"></script>
     <script type="text/javascript">
-      (function() {
-	var jasmineEnv = jasmine.getEnv();
-	jasmineEnv.updateInterval = 1000;
-
-	var htmlReporter = new jasmine.HtmlReporter();
-
-	jasmineEnv.addReporter(htmlReporter);
-
-	jasmineEnv.specFilter = function(spec) {
-	  return htmlReporter.specFilter(spec);
-	};
-
-	var currentWindowOnload = window.onload;
-
-	window.onload = function() {
-	  if (currentWindowOnload) {
-	    currentWindowOnload();
-	  }
-	  execJasmine();
-	};
-
-	function execJasmine() {
-	  jasmineEnv.execute();
-	}
-
-      })();
-  </script>
+      mkws_jasmine_init(500);
+    </script>
   <!-- EOF jasmine -->
 
   </head>
@@ -103,5 +77,6 @@
         </td>
       </tr>
     </table>
+
   </body>
 </html>
