Merge pull request #5540 from jow-/wireguard-peer-gridsection

[project/luci.git] / modules / luci-base / htdocs / luci-static / resources / cbi.js

diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index 22cbecc864b10f01a9f97f7936b6e13de17affc1..9200954d1e791f088f9bf66bab9a10637e1435f1 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
@@ -367,6 +367,17 @@ function cbi_validate_form(form, errmsg)
        return true;
 }
 
+function cbi_validate_named_section_add(input)
+{
+       var button = input.parentNode.parentNode.querySelector('.cbi-button-add');
+       if (input.value !== '') {
+               button.disabled = false;
+       }
+       else {
+               button.disabled = true;
+       }
+}
+
 function cbi_validate_reset(form)
 {
        window.setTimeout(
@@ -646,7 +657,11 @@ String.prototype.format = function()
                                                for (i = 0; (i < units.length) && (val > mf); i++)
                                                        val /= mf;
 
-                                               subst = (i ? val.toFixed(pr) : val) + units[i];
+                                               if (i)
+                                                       subst = val.toFixed(pr) + units[i] + (mf == 1024 ? 'i' : '');
+                                               else
+                                                       subst = val + ' ';
+
                                                pMinLength = null;
                                                break;
                                }
@@ -752,7 +767,7 @@ function cbi_update_table(table, data, placeholder) {
                });
 
                if (Array.isArray(data)) {
-                       var n = 0, rows = target.querySelectorAll('tr, .tr');
+                       var n = 0, rows = target.querySelectorAll('tr, .tr'), trows = [];
 
                        data.forEach(function(row) {
                                var trow = E('tr', { 'class': 'tr' });
@@ -762,7 +777,7 @@ function cbi_update_table(table, data, placeholder) {
                                        var td = trow.appendChild(E('td', {
                                                'class': titles[i].className,
                                                'data-title': (text !== '') ? text : null
-                                       }, row[i] || ''));
+                                       }, (row[i] != null) ? row[i] : ''));
 
                                        td.classList.remove('th');
                                        td.classList.add('td');
@@ -770,12 +785,16 @@ function cbi_update_table(table, data, placeholder) {
 
                                trow.classList.add('cbi-rowstyle-%d'.format((n++ % 2) ? 2 : 1));
 
-                               if (rows[n])
-                                       target.replaceChild(trow, rows[n]);
-                               else
-                                       target.appendChild(trow);
+                               trows[n] = trow;
                        });
 
+                       for (var i = 1; i <= n; i++) {
+                               if (rows[i])
+                                       target.replaceChild(trows[i], rows[i]);
+                               else
+                                       target.appendChild(trows[i]);
+                       }
+
                        while (rows[++n])
                                target.removeChild(rows[n]);