Merge branch 'master' into templateallthemarkup

[mkws-moved-to-github.git] / examples / htdocs / jasmine-cors-popup.html

diff --git a/examples/htdocs/jasmine-cors-popup.html b/examples/htdocs/jasmine-cors-popup.html
index e28ca6f..4e8cb6f 100644 (file)
--- a/examples/htdocs/jasmine-cors-popup.html
+++ b/examples/htdocs/jasmine-cors-popup.html
@@ -12,13 +12,16 @@
     </script>
 
     <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
-    <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
-
+    <script>var _jquery = jQuery; $ = jQuery = mkws.$; </script>
     <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
+    <script>jQuery = $ = _jquery; </script>
+
+    <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
     <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
 
     <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>
 
@@ -27,7 +30,6 @@
     <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>
 
     <style type="text/css">
       body > div > form > input.ui-state-default { background: none; }
@@ -47,6 +49,7 @@
 
     <script type="text/javascript">
     var mkws_config = {
+      service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy-testauth",
       perpage_default: 10
     };
 
@@ -60,17 +63,19 @@
 
     <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>
       <div class="mkwsLang"></div>
       <div class="mkwsProgress"></div>
-      <div class="mkwsSearch"></div>
       <div class="mkwsResults"></div>
       <div class="mkwsTargets"></div>
       <div class="mkwsStat"></div>
       <div class="mkwsBuilder"></div>
+    </div>
 
       <!-- include jquery again -->
-      <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js"></script>
+      <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.js"></script>
       <script>
        $(document).ready(function() {
          // now the second jquery is used
@@ -88,6 +93,7 @@
          if (!mkws.$) {
            alert("MKWS jquery(3) is not set!!!");
          }
+
        });
       </script>
   </body>