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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 254 // Proxy | 254 // Proxy |
| 255 options.proxyexceptions.ProxyExceptions.decorate($('ignored-host-list')); | 255 options.proxyexceptions.ProxyExceptions.decorate($('ignored-host-list')); |
| 256 $('remove-host').addEventListener('click', | 256 $('remove-host').addEventListener('click', |
| 257 this.handleRemoveProxyExceptions_); | 257 this.handleRemoveProxyExceptions_); |
| 258 $('add-host').addEventListener('click', this.handleAddProxyException_); | 258 $('add-host').addEventListener('click', this.handleAddProxyException_); |
| 259 $('direct-proxy').addEventListener('click', this.disableManualProxy_); | 259 $('direct-proxy').addEventListener('click', this.disableManualProxy_); |
| 260 $('manual-proxy').addEventListener('click', this.enableManualProxy_); | 260 $('manual-proxy').addEventListener('click', this.enableManualProxy_); |
| 261 $('auto-proxy').addEventListener('click', this.disableManualProxy_); | 261 $('auto-proxy').addEventListener('click', this.disableManualProxy_); |
| 262 $('proxy-all-protocols').addEventListener('click', | 262 $('proxy-all-protocols').addEventListener('click', |
| 263 this.toggleSingleProxy_); | 263 this.toggleSingleProxy_); |
| 264 $('proxy-use-pac-url').addEventListener('click', | |
|
Dan Beam
2013/04/17 20:55:50
nit: click -> change
| |
| 265 this.handleAutoConfigProxy_); | |
| 264 | 266 |
| 265 observePrefsUI($('direct-proxy')); | 267 observePrefsUI($('direct-proxy')); |
| 266 observePrefsUI($('manual-proxy')); | 268 observePrefsUI($('manual-proxy')); |
| 267 observePrefsUI($('auto-proxy')); | 269 observePrefsUI($('auto-proxy')); |
| 268 observePrefsUI($('proxy-all-protocols')); | 270 observePrefsUI($('proxy-all-protocols')); |
| 271 observePrefsUI($('proxy-use-pac-url')); | |
| 269 | 272 |
| 270 $('ip-automatic-configuration-checkbox').addEventListener('click', | 273 $('ip-automatic-configuration-checkbox').addEventListener('click', |
| 271 this.handleIpAutoConfig_); | 274 this.handleIpAutoConfig_); |
| 272 $('automatic-dns-radio').addEventListener('click', | 275 $('automatic-dns-radio').addEventListener('click', |
| 273 this.handleNameServerTypeChange_); | 276 this.handleNameServerTypeChange_); |
| 274 $('google-dns-radio').addEventListener('click', | 277 $('google-dns-radio').addEventListener('click', |
| 275 this.handleNameServerTypeChange_); | 278 this.handleNameServerTypeChange_); |
| 276 $('user-dns-radio').addEventListener('click', | 279 $('user-dns-radio').addEventListener('click', |
| 277 this.handleNameServerTypeChange_); | 280 this.handleNameServerTypeChange_); |
| 278 | 281 |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 423 if ($('proxy-all-protocols').checked) { | 426 if ($('proxy-all-protocols').checked) { |
| 424 $('multi-proxy').hidden = true; | 427 $('multi-proxy').hidden = true; |
| 425 $('single-proxy').hidden = false; | 428 $('single-proxy').hidden = false; |
| 426 } else { | 429 } else { |
| 427 $('multi-proxy').hidden = false; | 430 $('multi-proxy').hidden = false; |
| 428 $('single-proxy').hidden = true; | 431 $('single-proxy').hidden = true; |
| 429 } | 432 } |
| 430 }, | 433 }, |
| 431 | 434 |
| 432 /** | 435 /** |
| 436 * Handler for when the user clicks on the checkbox to enter | |
| 437 * auto configuration URL. | |
| 438 * @private | |
| 439 * @param {Event} e Click Event. | |
| 440 */ | |
| 441 handleAutoConfigProxy_: function(e) { | |
| 442 if ($('proxy-use-pac-url').checked) { | |
| 443 $('proxy-pac-url').disabled = false; | |
| 444 } else { | |
| 445 $('proxy-pac-url').disabled = true; | |
| 446 } | |
|
Dan Beam
2013/04/17 20:55:50
$('proxy-pac-url').disabled = !$('proxy-use-pac-ur
| |
| 447 }, | |
| 448 | |
| 449 /** | |
| 433 * Handler for selecting a radio button that will disable the manual | 450 * Handler for selecting a radio button that will disable the manual |
| 434 * controls. | 451 * controls. |
| 435 * @private | 452 * @private |
| 436 * @param {Event} e Click event. | 453 * @param {Event} e Click event. |
| 437 */ | 454 */ |
| 438 disableManualProxy_: function(e) { | 455 disableManualProxy_: function(e) { |
| 439 $('advanced-config').hidden = true; | 456 $('advanced-config').hidden = true; |
| 440 $('proxy-all-protocols').disabled = true; | 457 $('proxy-all-protocols').disabled = true; |
| 441 $('proxy-host-name').disabled = true; | 458 $('proxy-host-name').disabled = true; |
| 442 $('proxy-host-port').disabled = true; | 459 $('proxy-host-port').disabled = true; |
| 443 $('proxy-host-single-name').disabled = true; | 460 $('proxy-host-single-name').disabled = true; |
| 444 $('proxy-host-single-port').disabled = true; | 461 $('proxy-host-single-port').disabled = true; |
| 445 $('secure-proxy-host-name').disabled = true; | 462 $('secure-proxy-host-name').disabled = true; |
| 446 $('secure-proxy-port').disabled = true; | 463 $('secure-proxy-port').disabled = true; |
| 447 $('ftp-proxy').disabled = true; | 464 $('ftp-proxy').disabled = true; |
| 448 $('ftp-proxy-port').disabled = true; | 465 $('ftp-proxy-port').disabled = true; |
| 449 $('socks-host').disabled = true; | 466 $('socks-host').disabled = true; |
| 450 $('socks-port').disabled = true; | 467 $('socks-port').disabled = true; |
| 451 $('proxy-config').disabled = $('auto-proxy').disabled || | 468 $('proxy-use-pac-url').disabled = $('auto-proxy').disabled || |
| 452 !$('auto-proxy').checked; | 469 !$('auto-proxy').checked; |
| 470 $('proxy-pac-url').disabled = $('proxy-use-pac-url').disabled || | |
| 471 !$('proxy-use-pac-url').checked; | |
| 453 }, | 472 }, |
| 454 | 473 |
| 455 /** | 474 /** |
| 456 * Handler for selecting a radio button that will enable the manual | 475 * Handler for selecting a radio button that will enable the manual |
| 457 * controls. | 476 * controls. |
| 458 * @private | 477 * @private |
| 459 * @param {Event} e Click event. | 478 * @param {Event} e Click event. |
| 460 */ | 479 */ |
| 461 enableManualProxy_: function(e) { | 480 enableManualProxy_: function(e) { |
| 462 $('advanced-config').hidden = false; | 481 $('advanced-config').hidden = false; |
| 463 $('ignored-host-list').redraw(); | 482 $('ignored-host-list').redraw(); |
| 464 var allDisabled = $('manual-proxy').disabled; | 483 var allDisabled = $('manual-proxy').disabled; |
| 465 $('new-host').disabled = allDisabled; | 484 $('new-host').disabled = allDisabled; |
| 466 $('remove-host').disabled = allDisabled; | 485 $('remove-host').disabled = allDisabled; |
| 467 $('add-host').disabled = allDisabled; | 486 $('add-host').disabled = allDisabled; |
| 468 $('proxy-all-protocols').disabled = allDisabled; | 487 $('proxy-all-protocols').disabled = allDisabled; |
| 469 $('proxy-host-name').disabled = allDisabled; | 488 $('proxy-host-name').disabled = allDisabled; |
| 470 $('proxy-host-port').disabled = allDisabled; | 489 $('proxy-host-port').disabled = allDisabled; |
| 471 $('proxy-host-single-name').disabled = allDisabled; | 490 $('proxy-host-single-name').disabled = allDisabled; |
| 472 $('proxy-host-single-port').disabled = allDisabled; | 491 $('proxy-host-single-port').disabled = allDisabled; |
| 473 $('secure-proxy-host-name').disabled = allDisabled; | 492 $('secure-proxy-host-name').disabled = allDisabled; |
| 474 $('secure-proxy-port').disabled = allDisabled; | 493 $('secure-proxy-port').disabled = allDisabled; |
| 475 $('ftp-proxy').disabled = allDisabled; | 494 $('ftp-proxy').disabled = allDisabled; |
| 476 $('ftp-proxy-port').disabled = allDisabled; | 495 $('ftp-proxy-port').disabled = allDisabled; |
| 477 $('socks-host').disabled = allDisabled; | 496 $('socks-host').disabled = allDisabled; |
| 478 $('socks-port').disabled = allDisabled; | 497 $('socks-port').disabled = allDisabled; |
| 479 $('proxy-config').disabled = true; | 498 $('proxy-use-pac-url').disabled = true; |
| 499 $('proxy-pac-url').disabled = true; | |
| 480 }, | 500 }, |
| 481 }; | 501 }; |
| 482 | 502 |
| 483 /** | 503 /** |
| 484 * Enables or Disables all buttons that provide operations on the cellular | 504 * Enables or Disables all buttons that provide operations on the cellular |
| 485 * network. | 505 * network. |
| 486 */ | 506 */ |
| 487 DetailsInternetPage.changeCellularButtonsState = function(disable) { | 507 DetailsInternetPage.changeCellularButtonsState = function(disable) { |
| 488 var buttonsToDisableList = | 508 var buttonsToDisableList = |
| 489 new Array('details-internet-login', | 509 new Array('details-internet-login', |
| (...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1123 | 1143 |
| 1124 // Don't show page name in address bar and in history to prevent people | 1144 // Don't show page name in address bar and in history to prevent people |
| 1125 // navigate here by hand and solve issue with page session restore. | 1145 // navigate here by hand and solve issue with page session restore. |
| 1126 OptionsPage.showPageByName('detailsInternetPage', false); | 1146 OptionsPage.showPageByName('detailsInternetPage', false); |
| 1127 }; | 1147 }; |
| 1128 | 1148 |
| 1129 return { | 1149 return { |
| 1130 DetailsInternetPage: DetailsInternetPage | 1150 DetailsInternetPage: DetailsInternetPage |
| 1131 }; | 1151 }; |
| 1132 }); | 1152 }); |
| OLD | NEW |