Chromium Code Reviews| Index: chrome/browser/resources/options/chromeos/internet_detail.js |
| diff --git a/chrome/browser/resources/options/chromeos/internet_detail.js b/chrome/browser/resources/options/chromeos/internet_detail.js |
| index b9e81e5f2eafff569bc0bd8e33e804a1e7c16590..4e64c4601da2537247e4ecd570f8274e603b8a3e 100644 |
| --- a/chrome/browser/resources/options/chromeos/internet_detail.js |
| +++ b/chrome/browser/resources/options/chromeos/internet_detail.js |
| @@ -261,11 +261,14 @@ cr.define('options.internet', function() { |
| $('auto-proxy').addEventListener('click', this.disableManualProxy_); |
| $('proxy-all-protocols').addEventListener('click', |
| this.toggleSingleProxy_); |
| + $('proxy-config-url').addEventListener('click', |
| + this.toggleAutoConfigProxy_); |
| observePrefsUI($('direct-proxy')); |
| observePrefsUI($('manual-proxy')); |
| observePrefsUI($('auto-proxy')); |
| observePrefsUI($('proxy-all-protocols')); |
| + observePrefsUI($('proxy-config-url')); |
| $('ip-automatic-configuration-checkbox').addEventListener('click', |
| this.handleIpAutoConfig_); |
| @@ -430,6 +433,21 @@ cr.define('options.internet', function() { |
| }, |
| /** |
| + * Handler for when the user clicks on the checkbox to enter |
| + * auto configuration URL. |
| + * @private |
| + * @param {Event} e Click Event. |
| + */ |
| + toggleAutoConfigProxy_: function(e) { |
| + if ($('proxy-config-url').checked) { |
| + $('proxy-config').disabled = false; |
| + } else { |
| + $('proxy-config').disabled = true; |
| + $('proxy-config').textContent = ''; |
| + } |
| + }, |
| + |
| + /** |
| * Handler for selecting a radio button that will disable the manual |
| * controls. |
| * @private |
| @@ -448,8 +466,10 @@ cr.define('options.internet', function() { |
| $('ftp-proxy-port').disabled = true; |
| $('socks-host').disabled = true; |
| $('socks-port').disabled = true; |
| - $('proxy-config').disabled = $('auto-proxy').disabled || |
| + $('proxy-config-url').disabled = $('auto-proxy').disabled || |
|
Dan Beam
2013/03/29 22:23:34
nit: can you put proxy-config-url second, i.e.
|
| !$('auto-proxy').checked; |
| + $('proxy-config').disabled = $('proxy-config-url').disabled || |
| + !$('proxy-config-url').checked; |
| }, |
| /** |
| @@ -476,6 +496,7 @@ cr.define('options.internet', function() { |
| $('ftp-proxy-port').disabled = allDisabled; |
| $('socks-host').disabled = allDisabled; |
| $('socks-port').disabled = allDisabled; |
| + $('proxy-config-url').disabled = true; |
|
Dan Beam
2013/03/29 22:23:34
same here, can you put proxy-config-url after, lik
|
| $('proxy-config').disabled = true; |
| }, |
| }; |