projects / zefram / minetest / minetest_engine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e7f5cdf)
Fix masterserver javascript: adjustable output id
authorproller <proller@github.com>
Thu, 11 Apr 2013 16:18:34 +0000 (20:18 +0400)
committerproller <proller@github.com>
Thu, 11 Apr 2013 16:20:11 +0000 (20:20 +0400)
util/master/index.html patch | blob | history
util/master/list.js patch | blob | history

diff --git a/util/master/index.html b/util/master/index.html
index 63ee5c70fa453a079c7d91cc438c1f7a8f1cd0e1..328dd893424f3908a1779fe494a47c16ca106b06 100644 (file)
--- a/util/master/index.html
+++ b/util/master/index.html
@@ -5,7 +5,7 @@
         <title>Minetest server list</title>
         <link rel="stylesheet" href="style.css"/>
     </head>
-    <body><div id="table"></div></body>
+    <body><div id="servers_table"></div></body>
 </html>
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
 <script src="list.js"></script>
diff --git a/util/master/list.js b/util/master/list.js
index 990bb6ded9f11f33f5ad162724b34bcb7a540e69..98f5ad490a6ff6b1a3ca7582c638b3a7ba77a0e1 100644 (file)
--- a/util/master/list.js
+++ b/util/master/list.js
@@ -1,3 +1,5 @@
+var master_root, output_to;
+
 function e(s) {
     if (typeof s === "undefined") s = '';
     return s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;'); //mc"
@@ -39,7 +41,7 @@ function human_time(t, abs) {
 
 function success(r) {
     if (!r || !r.list) return;
-    var h = '<table class="mts_table"><tr class="mts_head"><th>ip[:port]</th><th>clients/max</th><th>version gameid</th><th>name</th><th>desc</th><th>flags</th><th>uptime</th><th>ping</th></tr>';
+    var h = '<table class="mts_table"><tr class="mts_head"><th>ip[:port]</th><th>clients/max</th><th>version gameid</th><th>name</th><th>description</th><th>flags</th><th>uptime</th><th>ping</th></tr>';
     for (var i = 0; i < r.list.length; ++i) {
         var s = r.list[i];
         if (!s) continue;
@@ -60,9 +62,8 @@ function success(r) {
         h += '</tr>';
     }
     h += '</table>'
-    jQuery('#table').html(h);
+    jQuery(output_to || '#servers_table').html(h);
 }
-var master_root;
 
 function get() {
     jQuery.getJSON((master_root || '') + 'list', success);
Minetest engine