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..19358644619285dc06f06b2a9680898f901e624e 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,20 @@ 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) { |
|
Dan Beam
2013/04/06 01:45:14
$('proxy-config').disabled = !$('proxy-config-url'
pneubeck (no reviews)
2013/04/09 09:48:19
"toggle" sounds to me like it switches between two
|
| + if ($('proxy-config-url').checked) { |
| + $('proxy-config').disabled = false; |
| + } else { |
| + $('proxy-config').disabled = true; |
| + } |
| + }, |
| + |
| + /** |
| * Handler for selecting a radio button that will disable the manual |
| * controls. |
| * @private |
| @@ -448,8 +465,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 || |
| - !$('auto-proxy').checked; |
| + $('proxy-config').disabled = $('proxy-config-url').disabled || |
|
Greg Spencer (Chromium)
2013/04/08 20:07:32
Isn't this redundant? (because disabled == !checke
pneubeck (no reviews)
2013/04/09 09:48:19
These lines are only confusing. Why would you ask
|
| + !$('proxy-config-url').checked; |
| + $('proxy-config-url').disabled = $('auto-proxy').disabled || |
| + !$('auto-proxy').checked; |
| }, |
| /** |
| @@ -477,6 +496,7 @@ cr.define('options.internet', function() { |
| $('socks-host').disabled = allDisabled; |
| $('socks-port').disabled = allDisabled; |
| $('proxy-config').disabled = true; |
| + $('proxy-config-url').disabled = true; |
| }, |
| }; |