luci-mod-network: ensure consistent bridge port and network interface order

[project/luci.git] / modules / luci-mod-network / htdocs / luci-static / resources / tools / network.js

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
index 11d2162d1116480c16a76af5c38dfe3f45d720ee..c31015a564cf76e663e4ee6c89dc8ab3bef0a74d 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
@@ -780,6 +780,8 @@ return baseclass.extend({
                                return network.instantiateDevice(port)
                        }).filter(function(dev) {
                                return dev.getType() != 'wifi' || dev.isUp();
+                       }).sort(function(a, b) {
+                               return L.naturalCompare(a.getName(), b.getName());
                        });
 
                        this.children = this.children.filter(function(opt) { return !opt.option.match(/^port_/) });
@@ -893,18 +895,6 @@ return baseclass.extend({
                for (var port_name in seen_ports)
                        ports.push(port_name);
 
-               ports.sort(function(a, b) {
-                       var m1 = a.match(/^(.+?)([0-9]*)$/),
-                           m2 = b.match(/^(.+?)([0-9]*)$/);
-
-                       if (m1[1] < m2[1])
-                               return -1;
-                       else if (m1[1] > m2[1])
-                               return 1;
-                       else
-                               return +(m1[2] || 0) - +(m2[2] || 0);
-               });
-
                ss.updatePorts(ports);
        },