Move more code into JS. Reorder document-ready function

diff --git a/experiments/spclient/index.html b/experiments/spclient/index.html
index f24a91f..32d894a 100644 (file)
--- a/experiments/spclient/index.html
+++ b/experiments/spclient/index.html
@@ -14,11 +14,7 @@
       <p>Searching will not work if JavaScript is disabled.</p>
     </noscript>
     <div id="mkwsSwitch"></div>
-    <form id="searchForm" name="search">
-      <input id="query" type="text" size="50" />
-      <input id="button" type="submit" value="Search" />
-    </form>
-    </div>
+    <div id="mkwsSearch"></div>
     <div id="recordview">
       <table width="100%" border="0" cellpadding="6" cellspacing="0">
         <tr>

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index eacaec5..15dcd17 100644 (file)
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -373,10 +373,6 @@ function renderDetails(data, marker)
 
 
 $(document).ready(function() { 
-    domReady();
-    var jqxhr = jQuery.get("/service-proxy-auth")
-       .fail(function() { alert("service proxy authentifiction failed"); });
-
     $("#mkwsSwitch").html($("<a/>", { href: '#',
                                      onclick: "switchView(\'recordview\')",
                                      text: "Record Browser",
@@ -386,4 +382,18 @@ $(document).ready(function() {
                                        onclick: "switchView(\'targetview\')",
                                        text: "Target Info",
                                      }));
+
+    // For some reason, doing this programmatically results in
+    // document.search.query being undefined, hence the raw HTML.
+    $("#mkwsSearch").html('\
+    <form id="searchForm" name="search">\
+      <input id="query" type="text" size="50" />\
+      <input id="button" type="submit" value="Search" />\
+    </form>');
+
+    domReady();
+
+    var jqxhr = jQuery.get("/service-proxy-auth")
+       .fail(function() { alert("service proxy authentifiction failed"); });
+
 });