X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci2%2Fui.git;a=blobdiff_plain;f=luci2%2Fhtdocs%2Fluci2%2Fview%2Fsystem.leds.js;h=b0d31ea2faa848a6a19a2416ac1824e03b3012bc;hp=f86a60c187766941bcca7d1ff469f3f390137d42;hb=cc66f6160f8e44d07bf92b9321144fdc0c1cf473;hpb=2f0e65dd27549ef4fde5b18588083968a59b66bd

diff --git a/luci2/htdocs/luci2/view/system.leds.js b/luci2/htdocs/luci2/view/system.leds.js
index f86a60c..b0d31ea 100644
--- a/luci2/htdocs/luci2/view/system.leds.js
+++ b/luci2/htdocs/luci2/view/system.leds.js
@@ -5,7 +5,7 @@ L.ui.view.extend({
             description: L.tr('Customizes the behaviour of the device LEDs if possible.'),
             prepare: function() {
                 return $.when(
-                    L.system.listLEDs(function(leds) {
+                    L.system.listLEDs().then(function(leds) {
                         delete m.sections[0].fields.sysfs.choices;
                         delete m.sections[0].fields.trigger.choices;
 
@@ -15,7 +15,7 @@ L.ui.view.extend({
                         for (var i = 0; i < leds[0].triggers.length; i++)
                             m.sections[0].fields.trigger.value(leds[0].triggers[i]);
                     }),
-                    L.system.listUSBDevices(function(devs) {
+                    L.system.listUSBDevices().then(function(devs) {
                         delete m.sections[0].fields._usb_dev.choices;
 
                         for (var i = 0; i < devs.length; i++)
@@ -23,17 +23,8 @@ L.ui.view.extend({
                                                                 '%04x:%04x (%s - %s)'.format(devs[i].vendor_id, devs[i].product_id,
                                                                                              devs[i].vendor_name || '?', devs[i].product_name || '?'));
                     }),
-                    L.network.getDeviceStatus(undefined, function(devs) {
-                        var devices = [ ];
-
-                        for (var device in devs)
-                            if (device != 'lo')
-                                devices.push(device);
-
-                        devices.sort();
-
+                    L.network.listDeviceNames().then(function(devices) {
                         delete m.sections[0].fields._net_dev.choices;
-
                         for (var i = 0; i < devices.length; i++)
                             m.sections[0].fields._net_dev.value(devices[i]);
                     })