refactor

[mkws-moved-to-github.git] / experiments / spclient / mkws.js

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index cb1a459..3eb4931 100644 (file)
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -384,7 +384,7 @@ function mkws_html_all(data) {
        sort_default: "relevance",
        perpage_default: 20,
        query_width: 50,
-       mkws_switch: true, /* show/hide Records|Targets menu */
+       switch: true, /* show/hide Records|Targets menu */
 
        dummy: "dummy"
     };
@@ -394,8 +394,6 @@ function mkws_html_all(data) {
        config[k] = data[k];
     }
 
-    mkws_html_switch(config);
-
     // For some reason, doing this programmatically results in
     // document.search.query being undefined, hence the raw HTML.
     $("#mkwsSearch").html('\
@@ -426,11 +424,8 @@ function mkws_html_all(data) {
       </table>\
     </div>');
 
-    $("#mkwsTargets").html('\
-      <div id="bytarget">\
-       No information available yet.\
-      </div>');
-    $("#mkwsTargets").css("display", "none");
+    mkws_html_switch(config);
+    mkws_service_proxy_auth(config.service_proxy_auth);
 
     domReady();
 }
@@ -448,7 +443,13 @@ function mkws_html_switch(config) {
        text: "Targets"
     }));
 
-    if (!config.mkws_switch) {
+    $("#mkwsTargets").html('\
+      <div id="bytarget">\
+       No information available yet.\
+      </div>');
+    $("#mkwsTargets").css("display", "none");
+
+    if (!config.switch) {
         $("#mkwsSwitch").css("display", "none");
     }
 }
@@ -514,5 +515,5 @@ function mkws_service_proxy_auth(auth_url) {
        });
 }
 
+/* magic */
 $(document).ready(function() { mkws_html_all(mkws_config) });
-$(document).ready(function() { mkws_service_proxy_auth(); });