projects / mkws-moved-to-github.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 2b43858..4e8cb6f 100644 (file)
--- a/examples/htdocs/jasmine-cors-popup.html
+++ b/examples/htdocs/jasmine-cors-popup.html
@@ -3,20 +3,25 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo: jQuery popup plugin with jasmine test framework</title>
 
-    <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js">
+    <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js"></script>
+    <script>
       // create a function in external jquery object
       $.extend({
-       mkws_jasmine_external_jquery_object: function () { return true; }
+       mkws_external_jquery_object: function () { return true; }
       });
     </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 type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
+    <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>
 
@@ -25,11 +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>
-
-    <!-- jquery null test
-    <script type="text/javascript">$ = undefined;</script>
-       -->
 
     <style type="text/css">
       body > div > form > input.ui-state-default { background: none; }
@@ -37,10 +37,19 @@
   </head>
 
   <body>
-    <script type="text/javascript">
+    <script>
+      // jquery.js from <head> section
+      if (!($.mkws_external_jquery_object && $.mkws_external_jquery_object())) {
+       alert("External jquery(1) mis-match!!!");
+      }
+      if (mkws.$.mkws_external_jquery_object && mkws.$.mkws_external_jquery_object()) {
+       alert("Internal jquery(1) mis-match!!!");
+      }
+    </script>
 
-    // using a local service proxy !!!
+    <script type="text/javascript">
     var mkws_config = {
+      service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy-testauth",
       perpage_default: 10
     };
 
@@ -50,19 +59,42 @@
       check_motd: false,
       show_record_url: true
     };
-
     </script>
 
-<h2>MKWS Jasmine regression tests</h2>
+    <h2>MKWS Jasmine regression tests</h2>
 
-    <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 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="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.js"></script>
+      <script>
+       $(document).ready(function() {
+         // now the second jquery is used
+         if ($.mkws_external_jquery_object && $.mkws_external_jquery_object()) {
+           alert("External jquery(2) mis-match!!!");
+         }
+         if (mkws.$.mkws_external_jquery_object && mkws.$.mkws_external_jquery_object()) {
+           alert("Internal jquery(2) mis-match!!!");
+         }
+
+         // jquery null test
+         $ = undefined;
+         jQuery = undefined;
+
+         if (!mkws.$) {
+           alert("MKWS jquery(3) is not set!!!");
+         }
 
+       });
+      </script>
   </body>
 </html>
MasterKey Widget Set