Commit 318ee398 authored by gspencer@chromium.org's avatar gspencer@chromium.org

This fixes a problem with the WiFi internet details

that I introduced with my last change.

BUG=none
TEST=ran on device and on Linux.


Review URL: https://chromiumcodereview.appspot.com/10832319

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151869 0039d316-1c4b-4281-b951-d872f2087c98
parent c3131ee3
......@@ -763,8 +763,11 @@ cr.define('options.internet', function() {
configureAddressField($('ip-netmask'), inetNetmask);
configureAddressField($('ip-gateway'), inetGateway);
if (data.ipconfig.value && data.ipconfig.value.nameServers)
$('automatic-dns-display').textContent = data.ipconfig.value.nameServers;
var inetNameServers = '';
if (data.ipconfig.value && data.ipconfig.value.nameServers) {
inetNameServers = data.ipconfig.value.nameServers;
$('automatic-dns-display').textContent = inetNameServers;
}
if (data.savedIP && data.savedIP.nameServers)
$('automatic-dns-display').textContent = data.savedIP.nameServers;
......@@ -812,9 +815,9 @@ cr.define('options.internet', function() {
} else {
$('wifi-bssid-entry').hidden = true;
}
$('wifi-ip-address').textContent = inetAddress;
$('wifi-netmask').textContent = inetNetmask;
$('wifi-gateway').textContent = inetGateway;
$('wifi-ip-address').textContent = inetAddress.value;
$('wifi-netmask').textContent = inetNetmask.value;
$('wifi-gateway').textContent = inetGateway.value;
$('wifi-name-servers').textContent = inetNameServers;
if (data.encryption && data.encryption.length > 0) {
$('wifi-security').textContent = data.encryption;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment