From: Mike Taylor <mike@indexdata.com>
Date: Fri, 28 Jun 2013 11:07:24 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 0.9.1~409^2~4
X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=5f5554ba63e106d8dc0b03ae04ea7e428dc1c64e;hp=27675ad2926bda23cd9869cf0764d003e3bfa527;p=mkws-moved-to-github.git

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

diff --git a/experiments/spclient/index-popup.html b/experiments/spclient/index-popup.html
index 2fb8c5c..f99f0e5 100644
--- a/experiments/spclient/index-popup.html
+++ b/experiments/spclient/index-popup.html
@@ -3,12 +3,14 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo client</title>
     <link rel="stylesheet" href="mkwsStyle.css" />
-    <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
+    <link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
+
+    <script type="text/javascript">
+      mkws_config = { switch_menu: false, lang_menu: false, query_width: 40 };
+    </script>
+    <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
     <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
-    <script type="text/javascript" src="http://mkws.indexdata.com/libjs-pz2/pz2api.1.js"></script>
-    <script type="text/javascript" src="mkws.js"></script>
 
-    <link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
         <style>
                 body { font-size: 62.5%; }
                 label, input { display:block; }
@@ -37,7 +39,7 @@
                                 }
                         },
                         close: function() {
-                                allFields.val( "" ).removeClass( "ui-state-error" );
+                                // allFields.val( "" ).removeClass( "ui-state-error" );
                         }
                 });
 
@@ -53,7 +55,6 @@
 
   <div id="dialog-form" title="Search Box">
     <script type="text/javascript">
-      mkws_config = { switch_menu: false, lang_menu: false, query_width: 40 };
       jQuery.pazpar2();
     </script>
   </div>
@@ -64,3 +65,4 @@
 
   </body>
 </html>
+