From ce5d32ce282160fa152eb701afad2949fb3f2534 Mon Sep 17 00:00:00 2001 From: Niklas Date: Mon, 24 Oct 2011 14:52:29 +0200 Subject: manual conf shows now a no interfaces found message without any form fields. --- src/html/js/networkDiscovery.js | 131 ++++++++++++++++++++++------------------ 1 file changed, 72 insertions(+), 59 deletions(-) diff --git a/src/html/js/networkDiscovery.js b/src/html/js/networkDiscovery.js index 1d67eac..7f065d0 100644 --- a/src/html/js/networkDiscovery.js +++ b/src/html/js/networkDiscovery.js @@ -44,73 +44,86 @@ var getInterfaceConf = function (i) { var n = i.options[i.selectedIndex].text(); }; + + var ip4_manualConfigurationDialog = function () { var jsonArr = fbgui.getManualConfInterfaces(); - //jsonArr = eval('(' + jsonArr + ')'); - var c = ""; + jQuery.each(jsonArr, function() { c += " "; - } - ); - } - c += ""; - $("#nd_mc_ifname").html(c); + } + ); + + c += ""; + $("#nd_mc_ifname").html(c); - var ifname = $("#nd_mc_ifname_select :selected").text(), - ipaddr = $("#ipaddr"), - netmask = $("#netmask"), - broadcast = $("#broadcast"), - gateway = $("#gateway"), - dns = $("#dns"), - allFields = $([]).add(ipaddr).add(netmask).add(broadcast).add(gateway).add(dns); + var ifname = $("#nd_mc_ifname_select :selected").text(), + ipaddr = $("#ipaddr"), + netmask = $("#netmask"), + broadcast = $("#broadcast"), + gateway = $("#gateway"), + dns = $("#dns"), + allFields = $([]).add(ipaddr).add(netmask).add(broadcast).add(gateway).add(dns); - $("#nd_manual_configuration_dialog").dialog( - { buttons: { "Cancel": function() { - $(this).dialog("close");}, - "Ok": function() { - var bValid = true; - allFields.removeClass("ui-state-error"); - - bValid = bValid && checkLength(ipaddr, "IP-Address", 7, 15); - bValid = bValid && checkLength(netmask, "Netmask Address", 7, 15); - bValid = bValid && checkLength(broadcast, "Broadcast Address", 7, 15); - bValid = bValid && checkLength(gateway, "Gateway Address", 7, 15); - bValid = bValid && checkLength(dns, "DNS Address", 7, 15); - - bValid = bValid && checkRegexp(ipaddr, /\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/, "Is not a valid IP-Address! Format has to be e.g.: 192.168.1.2 (max value is 255)"); - bValid = bValid && checkRegexp(netmask, /\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/, "Is not a valid IP-Address! Format has to be e.g.: 255.255.255.0 (max value is 255)"); - bValid = bValid && checkRegexp(broadcast, /\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/, "Is not a valid IP-Address! Format has to be e.g.: 192.168.1.255 (max value is 255)"); - bValid = bValid && checkRegexp(gateway, /\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/, "Is not a valid IP-Address! Format has to be e.g.: 192.168.1.254 (max value is 255)"); - bValid = bValid && checkRegexp(dns, /\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/, "Is not a valid IP-Address! Format has to be e.g.: 192.168.1.111 (max value is 255)"); - - if (bValid) { - // put variables into a json object - // send to qt networkdiscovery - var o = {"ifname" : ifname, - "ipaddr" : ipaddr.val(), - "netmask" : netmask.val(), - "broadcast" : broadcast.val(), - "gateway" : gateway.val(), - "dns" : dns.val() } - try { - fbgui.ip4_setManualConfiguration(o); - } catch (e) { - fbgui.notifyCall(e); - } - $(this).dialog("close"); - } } - } , - minWidth: 450, - modal: true, - resizable: false, - draggable: false, - close: function() {allFields.val("").removeClass("ui-state-error");}, - open: function(event, ui) { $(".ui-dialog-titlebar-close").hide();} - }); + $("#nd_manual_configuration_dialog").dialog( + { buttons: { "Cancel": function() { + $(this).dialog("close");}, + "Ok": function() { + var bValid = true; + allFields.removeClass("ui-state-error"); + + bValid = bValid && checkLength(ipaddr, "IP-Address", 7, 15); + bValid = bValid && checkLength(netmask, "Netmask Address", 7, 15); + bValid = bValid && checkLength(broadcast, "Broadcast Address", 7, 15); + bValid = bValid && checkLength(gateway, "Gateway Address", 7, 15); + bValid = bValid && checkLength(dns, "DNS Address", 7, 15); + + bValid = bValid && checkRegexp(ipaddr, /\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/, "Is not a valid IP-Address! Format has to be e.g.: 192.168.1.2 (max value is 255)"); + bValid = bValid && checkRegexp(netmask, /\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/, "Is not a valid IP-Address! Format has to be e.g.: 255.255.255.0 (max value is 255)"); + bValid = bValid && checkRegexp(broadcast, /\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/, "Is not a valid IP-Address! Format has to be e.g.: 192.168.1.255 (max value is 255)"); + bValid = bValid && checkRegexp(gateway, /\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/, "Is not a valid IP-Address! Format has to be e.g.: 192.168.1.254 (max value is 255)"); + bValid = bValid && checkRegexp(dns, /\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/, "Is not a valid IP-Address! Format has to be e.g.: 192.168.1.111 (max value is 255)"); + + if (bValid) { + // put variables into a json object + // send to qt networkdiscovery + var o = {"ifname" : ifname, + "ipaddr" : ipaddr.val(), + "netmask" : netmask.val(), + "broadcast" : broadcast.val(), + "gateway" : gateway.val(), + "dns" : dns.val() } + try { + fbgui.ip4_setManualConfiguration(o); + } catch (e) { + fbgui.notifyCall(e); + } + $(this).dialog("close"); + } } + } , + minWidth: 450, + modal: true, + resizable: false, + draggable: false, + close: function() {allFields.val("").removeClass("ui-state-error");}, + open: function(event, ui) { $(".ui-dialog-titlebar-close").hide();} + }); + } }; var abortBootDialog = function (m) { -- cgit v1.2.3-55-g7522