Re-order parameters to pz2 constructor.

[mkws-moved-to-github.git] / tools / htdocs / mkws.js

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 2484229..65848c9 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -228,6 +228,10 @@ function team($, teamName) {
     m_sort = mkws_config.sort_default;
     debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to m_sort");
 
+    if (!isNaN(parseInt(mkws_config.perpage_default))) {
+       m_perpage = parseInt(mkws_config.perpage_default);
+    }
+
     // protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
     if (mkws_config.pazpar2_url.match(/^\/\//)) {
        mkws_config.pazpar2_url = document.location.protocol + mkws_config.pazpar2_url;
@@ -238,22 +242,19 @@ function team($, teamName) {
     // create a parameters array and pass it to the pz2's constructor
     // then register the form submit event with the pz2.search function
     // autoInit is set to true on default
-    m_paz = new pz2({ "onshow": onShow,
-                     "windowid": teamName,
-                     "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
+    m_paz = new pz2({ "windowid": teamName,
                      "pazpar2path": mkws_config.pazpar2_url,
+                     "usesessions" : mkws_config.use_service_proxy ? false : true,
                      "oninit": onInit,
+                     "onbytarget": onBytarget,
                      "onstat": onStat,
                      "onterm": (mkws_config.facets.length ? onTerm : undefined),
+                     "onshow": onShow,
+                     "onrecord": onRecord,
+                     "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
                      "termlist": mkws_config.facets.join(','),
-                     "onbytarget": onBytarget,
-                     "usesessions" : mkws_config.use_service_proxy ? false : true,
-                     "showResponseType": '', // or "json" (for debugging?)
-                     "onrecord": onRecord });
-
-    if (!isNaN(parseInt(mkws_config.perpage_default))) {
-       m_perpage = parseInt(mkws_config.perpage_default);
-    }
+                     "showResponseType": '' // or "json" (for debugging?)
+                   });
 
 
     // Finds the node of the specified class within the current team