projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b3a8a8a)
Move mkws_config setting up above inclusion of MKWS.
authorMike Taylor <mike@indexdata.com>
Tue, 8 Apr 2014 09:35:15 +0000 (10:35 +0100)
committerMike Taylor <mike@indexdata.com>
Tue, 8 Apr 2014 09:35:15 +0000 (10:35 +0100)
Patches around MKWS-149 ("setting pazpar2_url no longer works")
But we want to reinstate the old behaviour, so this is not a fix.

examples/htdocs/jasmine-popup.html patch | blob | history

diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index f979e63..f78b3b2 100644 (file)
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -6,6 +6,13 @@
     <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
 
+    <script type="text/javascript">
+    var mkws_config = {
+      perpage_default: 10,
+      pazpar2_url:          "//mkws.indexdata.com/service-proxy/",
+      service_proxy_auth:   "//mkws.indexdata.com/service-proxy-testauth"
+    };
+    </script>
     <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
     <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>
@@ -29,12 +36,6 @@
 
   <body>
     <script type="text/javascript">
-    var mkws_config = {
-      perpage_default: 10,
-      pazpar2_url:          "//mkws.indexdata.com/service-proxy/",
-      service_proxy_auth:   "//mkws.indexdata.com/service-proxy-testauth"
-    };
-
     jQuery.pazpar2({
         "layout": "popup",               /* "table" [default], "div", "popup" */
         "id_button": "input.mkwsButton", /* submit button id in search field */
MasterKey Widget Set