Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 cr.define('options.internet', function() { | 5 cr.define('options.internet', function() { |
| 6 var OptionsPage = options.OptionsPage; | 6 var OptionsPage = options.OptionsPage; |
| 7 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel; | 7 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel; |
| 8 /** @const */ var IPAddressField = options.internet.IPAddressField; | 8 /** @const */ var IPAddressField = options.internet.IPAddressField; |
| 9 | 9 |
| 10 /** | 10 /** |
| (...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 756 var configureAddressField = function(field, model) { | 756 var configureAddressField = function(field, model) { |
| 757 IPAddressField.decorate(field); | 757 IPAddressField.decorate(field); |
| 758 field.model = model; | 758 field.model = model; |
| 759 field.editable = model.autoConfig == 'user'; | 759 field.editable = model.autoConfig == 'user'; |
| 760 }; | 760 }; |
| 761 | 761 |
| 762 configureAddressField($('ip-address'), inetAddress); | 762 configureAddressField($('ip-address'), inetAddress); |
| 763 configureAddressField($('ip-netmask'), inetNetmask); | 763 configureAddressField($('ip-netmask'), inetNetmask); |
| 764 configureAddressField($('ip-gateway'), inetGateway); | 764 configureAddressField($('ip-gateway'), inetGateway); |
| 765 | 765 |
| 766 if (data.ipconfig.value && data.ipconfig.value.nameServers) | 766 var inetNameServers = ''; |
| 767 if (data.ipconfig.value && data.ipconfig.value.nameServers) { | |
| 767 $('automatic-dns-display').textContent = data.ipconfig.value.nameServers; | 768 $('automatic-dns-display').textContent = data.ipconfig.value.nameServers; |
| 769 inetNameServers = data.ipconfig.value.nameServers; | |
|
kevers
2012/08/15 18:09:25
nit suggestion
Consider reversing the ordering of
Greg Spencer (Chromium)
2012/08/15 18:12:29
Done.
| |
| 770 } | |
| 768 | 771 |
| 769 if (data.savedIP && data.savedIP.nameServers) | 772 if (data.savedIP && data.savedIP.nameServers) |
| 770 $('automatic-dns-display').textContent = data.savedIP.nameServers; | 773 $('automatic-dns-display').textContent = data.savedIP.nameServers; |
| 771 | 774 |
| 772 if (data.nameServersGoogle) | 775 if (data.nameServersGoogle) |
| 773 $('google-dns-display').textContent = data.nameServersGoogle; | 776 $('google-dns-display').textContent = data.nameServersGoogle; |
| 774 | 777 |
| 775 var nameServersUser = []; | 778 var nameServersUser = []; |
| 776 if (data.staticIP.value.nameServers) | 779 if (data.staticIP.value.nameServers) |
| 777 nameServersUser = data.staticIP.value.nameServers.split(','); | 780 nameServersUser = data.staticIP.value.nameServers.split(','); |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 805 detailsPage.wimax = false; | 808 detailsPage.wimax = false; |
| 806 detailsPage.shared = data.shared; | 809 detailsPage.shared = data.shared; |
| 807 $('wifi-connection-state').textContent = data.connectionState; | 810 $('wifi-connection-state').textContent = data.connectionState; |
| 808 $('wifi-ssid').textContent = data.ssid; | 811 $('wifi-ssid').textContent = data.ssid; |
| 809 if (data.bssid && data.bssid.length > 0) { | 812 if (data.bssid && data.bssid.length > 0) { |
| 810 $('wifi-bssid').textContent = data.bssid; | 813 $('wifi-bssid').textContent = data.bssid; |
| 811 $('wifi-bssid-entry').hidden = false; | 814 $('wifi-bssid-entry').hidden = false; |
| 812 } else { | 815 } else { |
| 813 $('wifi-bssid-entry').hidden = true; | 816 $('wifi-bssid-entry').hidden = true; |
| 814 } | 817 } |
| 815 $('wifi-ip-address').textContent = inetAddress; | 818 $('wifi-ip-address').textContent = inetAddress.value; |
| 816 $('wifi-netmask').textContent = inetNetmask; | 819 $('wifi-netmask').textContent = inetNetmask.value; |
| 817 $('wifi-gateway').textContent = inetGateway; | 820 $('wifi-gateway').textContent = inetGateway.value; |
| 818 $('wifi-name-servers').textContent = inetNameServers; | 821 $('wifi-name-servers').textContent = inetNameServers; |
| 819 if (data.encryption && data.encryption.length > 0) { | 822 if (data.encryption && data.encryption.length > 0) { |
| 820 $('wifi-security').textContent = data.encryption; | 823 $('wifi-security').textContent = data.encryption; |
| 821 $('wifi-security-entry').hidden = false; | 824 $('wifi-security-entry').hidden = false; |
| 822 } else { | 825 } else { |
| 823 $('wifi-security-entry').hidden = true; | 826 $('wifi-security-entry').hidden = true; |
| 824 } | 827 } |
| 825 // Frequency is in MHz. | 828 // Frequency is in MHz. |
| 826 var frequency = loadTimeData.getString('inetFrequencyFormat'); | 829 var frequency = loadTimeData.getString('inetFrequencyFormat'); |
| 827 frequency = frequency.replace('$1', data.frequency); | 830 frequency = frequency.replace('$1', data.frequency); |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1006 | 1009 |
| 1007 // Don't show page name in address bar and in history to prevent people | 1010 // Don't show page name in address bar and in history to prevent people |
| 1008 // navigate here by hand and solve issue with page session restore. | 1011 // navigate here by hand and solve issue with page session restore. |
| 1009 OptionsPage.showPageByName('detailsInternetPage', false); | 1012 OptionsPage.showPageByName('detailsInternetPage', false); |
| 1010 }; | 1013 }; |
| 1011 | 1014 |
| 1012 return { | 1015 return { |
| 1013 DetailsInternetPage: DetailsInternetPage | 1016 DetailsInternetPage: DetailsInternetPage |
| 1014 }; | 1017 }; |
| 1015 }); | 1018 }); |
| OLD | NEW |