From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 11 Jul 2014 09:24:07 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 1.0.0~378
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=851c0f6375bc9a304a4c1997a06c58f26b941e4d;hp=76fb961092cc65ba234105609bd2d30649b20bcf;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
---

diff --git a/examples/htdocs/jasmine-cors-popup.html b/examples/htdocs/jasmine-cors-popup.html
index 4263d0d..59ada3e 100644
--- 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>