Eliminate config parameter altogether from mkws_html_perpage()

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 0cad519..62b38cf 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -648,14 +648,14 @@ function mkws_html_all() {
            ranking_data +=  M('Sort by') + ' ' + mkws_html_sort() + ' ';
        }
        if (mkws_config.show_perpage) {
-           ranking_data += M('and show') + ' ' + mkws_html_perpage(mkws_config) + ' ' + M('per page') + '.';
+           ranking_data += M('and show') + ' ' + mkws_html_perpage() + ' ' + M('per page') + '.';
        }
         ranking_data += '</form>';
 
        $("#mkwsRanking").html(ranking_data);
     }
 
-    mkws_html_switch(mkws_config);
+    mkws_html_switch();
 
     if (mkws_config.use_service_proxy)
        mkws_service_proxy_auth(mkws_config.service_proxy_auth);
@@ -693,7 +693,7 @@ function mkws_set_lang()  {
     return mkws_config.lang;
 }
 
-function mkws_html_switch(config) {
+function mkws_html_switch() {
     debug("HTML switch");
 
     $("#mkwsSwitch").append($('<a href="#" id="mkwsSwitch_records" onclick="mkws.switchView(\'records\')">' + M('Records') + '</a>'));
@@ -713,8 +713,9 @@ function mkws_html_sort() {
     var sort_html = '<select name="mkwsSort" id="mkwsSort">';
 
     for(var i = 0; i < mkws_config.sort_options.length; i++) {
-       var key = mkws_config.sort_options[i][0];
-       var val = mkws_config.sort_options[i].length == 1 ? mkws_config.sort_options[i][0] : mkws_config.sort_options[i][1];
+       var opt = mkws_config.sort_options[i];
+       var key = opt[0];
+       var val = opt.length == 1 ? opt[0] : opt[1];
 
        sort_html += '<option value="' + key + '"';
        if (key == mkws_config.sort_default) {
@@ -727,15 +728,15 @@ function mkws_html_sort() {
     return sort_html;
 }
 
-function mkws_html_perpage(config) {
+function mkws_html_perpage() {
     debug("HTML perpage");
     var perpage_html = '<select name="mkwsPerpage" id="mkwsPerpage">';
 
-    for(var i = 0; i < config.perpage_options.length; i++) {
-       var key = config.perpage_options[i];
+    for(var i = 0; i < mkws_config.perpage_options.length; i++) {
+       var key = mkws_config.perpage_options[i];
 
        perpage_html += '<option value="' + key + '"';
-       if (key == config.perpage_default) {
+       if (key == mkws_config.perpage_default) {
            perpage_html += ' selected="selected"';
        }
        perpage_html += '>' + key + '</option>';