Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Side by Side Diff: chrome/browser/resources/options2/chromeos/network_list.js

Issue 10391044: retry 136193 - convert localStrings to loadTimeData for options page (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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.network', function() { 5 cr.define('options.network', function() {
6 6
7 var ArrayDataModel = cr.ui.ArrayDataModel; 7 var ArrayDataModel = cr.ui.ArrayDataModel;
8 var List = cr.ui.List; 8 var List = cr.ui.List;
9 var ListItem = cr.ui.ListItem; 9 var ListItem = cr.ui.ListItem;
10 var Menu = cr.ui.Menu; 10 var Menu = cr.ui.Menu;
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 this.className = 'network-group'; 218 this.className = 'network-group';
219 this.icon_ = this.ownerDocument.createElement('div'); 219 this.icon_ = this.ownerDocument.createElement('div');
220 this.icon_.className = 'network-icon'; 220 this.icon_.className = 'network-icon';
221 this.appendChild(this.icon_); 221 this.appendChild(this.icon_);
222 var textContent = this.ownerDocument.createElement('div'); 222 var textContent = this.ownerDocument.createElement('div');
223 textContent.className = 'network-group-labels'; 223 textContent.className = 'network-group-labels';
224 this.appendChild(textContent); 224 this.appendChild(textContent);
225 var categoryLabel = this.ownerDocument.createElement('div'); 225 var categoryLabel = this.ownerDocument.createElement('div');
226 var title = this.data_.key + 'Title'; 226 var title = this.data_.key + 'Title';
227 categoryLabel.className = 'network-title'; 227 categoryLabel.className = 'network-title';
228 categoryLabel.textContent = templateData[title]; 228 categoryLabel.textContent = loadTimeData.getString(title);
229 textContent.appendChild(categoryLabel); 229 textContent.appendChild(categoryLabel);
230 this.subtitle_ = this.ownerDocument.createElement('div'); 230 this.subtitle_ = this.ownerDocument.createElement('div');
231 this.subtitle_.className = 'network-subtitle'; 231 this.subtitle_.className = 'network-subtitle';
232 textContent.appendChild(this.subtitle_); 232 textContent.appendChild(this.subtitle_);
233 }, 233 },
234 }; 234 };
235 235
236 /** 236 /**
237 * Creates a control that displays a popup menu when clicked. 237 * Creates a control that displays a popup menu when clicked.
238 * @param {Object} data Description of the control. 238 * @param {Object} data Description of the control.
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 355
356 NetworkSelectorItem.prototype = { 356 NetworkSelectorItem.prototype = {
357 __proto__: NetworkMenuItem.prototype, 357 __proto__: NetworkMenuItem.prototype,
358 358
359 /* @inheritDoc */ 359 /* @inheritDoc */
360 decorate: function() { 360 decorate: function() {
361 // TODO(kevers): Generalize method of setting default label. 361 // TODO(kevers): Generalize method of setting default label.
362 var policyManaged = false; 362 var policyManaged = false;
363 var defaultMessage = this.data_.key == 'wifi' ? 363 var defaultMessage = this.data_.key == 'wifi' ?
364 'networkOffline' : 'networkNotConnected'; 364 'networkOffline' : 'networkNotConnected';
365 this.subtitle = templateData[defaultMessage]; 365 this.subtitle = loadTimeData.getString(defaultMessage);
366 var list = this.data_.networkList; 366 var list = this.data_.networkList;
367 var candidateURL = null; 367 var candidateURL = null;
368 for (var i = 0; i < list.length; i++) { 368 for (var i = 0; i < list.length; i++) {
369 var networkDetails = list[i]; 369 var networkDetails = list[i];
370 if (networkDetails.connecting || networkDetails.connected) { 370 if (networkDetails.connecting || networkDetails.connected) {
371 this.subtitle = networkDetails.networkName; 371 this.subtitle = networkDetails.networkName;
372 this.setSubtitleDirection('ltr'); 372 this.setSubtitleDirection('ltr');
373 policyManaged = networkDetails.policyManaged; 373 policyManaged = networkDetails.policyManaged;
374 candidateURL = networkDetails.iconURL; 374 candidateURL = networkDetails.iconURL;
375 // Only break when we see a connecting network as it is possible to 375 // Only break when we see a connecting network as it is possible to
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 * @return {Element} The newly created menu. 411 * @return {Element} The newly created menu.
412 */ 412 */
413 createMenu: function() { 413 createMenu: function() {
414 var menu = this.ownerDocument.createElement('div'); 414 var menu = this.ownerDocument.createElement('div');
415 menu.id = this.getMenuName_(); 415 menu.id = this.getMenuName_();
416 menu.className = 'network-menu'; 416 menu.className = 'network-menu';
417 menu.hidden = true; 417 menu.hidden = true;
418 Menu.decorate(menu); 418 Menu.decorate(menu);
419 var addendum = []; 419 var addendum = [];
420 if (this.data_.key == 'wifi') { 420 if (this.data_.key == 'wifi') {
421 addendum.push({label: localStrings.getString('joinOtherNetwork'), 421 addendum.push({label: loadTimeData.getString('joinOtherNetwork'),
422 command: 'connect', 422 command: 'connect',
423 data: {networkType: Constants.TYPE_WIFI, 423 data: {networkType: Constants.TYPE_WIFI,
424 servicePath: '?'}}); 424 servicePath: '?'}});
425 } else if (this.data_.key == 'cellular') { 425 } else if (this.data_.key == 'cellular') {
426 var label = enableDataRoaming_ ? 'disableDataRoaming' : 426 var label = enableDataRoaming_ ? 'disableDataRoaming' :
427 'enableDataRoaming'; 427 'enableDataRoaming';
428 var disabled = !UIAccountTweaks.currentUserIsOwner(); 428 var disabled = !UIAccountTweaks.currentUserIsOwner();
429 var entry = {label: localStrings.getString(label), 429 var entry = {label: loadTimeData.getString(label),
430 data: {}}; 430 data: {}};
431 if (disabled) { 431 if (disabled) {
432 entry.command = null; 432 entry.command = null;
433 entry.tooltip = 433 entry.tooltip =
434 localStrings.getString('dataRoamingDisableToggleTooltip'); 434 loadTimeData.getString('dataRoamingDisableToggleTooltip');
435 } else { 435 } else {
436 entry.command = function() { 436 entry.command = function() {
437 options.Preferences.setBooleanPref( 437 options.Preferences.setBooleanPref(
438 'cros.signed.data_roaming_enabled', 438 'cros.signed.data_roaming_enabled',
439 !enableDataRoaming_); 439 !enableDataRoaming_);
440 // Force revalidation of the menu the next time it is 440 // Force revalidation of the menu the next time it is
441 // displayed. 441 // displayed.
442 this.menu_ = null; 442 this.menu_ = null;
443 }; 443 };
444 } 444 }
445 addendum.push(entry); 445 addendum.push(entry);
446 } 446 }
447 var list = this.data.rememberedNetworks; 447 var list = this.data.rememberedNetworks;
448 if (list && list.length > 0) { 448 if (list && list.length > 0) {
449 var callback = function(list) { 449 var callback = function(list) {
450 $('remembered-network-list').clear(); 450 $('remembered-network-list').clear();
451 var dialog = options.PreferredNetworks.getInstance(); 451 var dialog = options.PreferredNetworks.getInstance();
452 OptionsPage.showPageByName('preferredNetworksPage', false); 452 OptionsPage.showPageByName('preferredNetworksPage', false);
453 dialog.update(list); 453 dialog.update(list);
454 }; 454 };
455 addendum.push({label: localStrings.getString('preferredNetworks'), 455 addendum.push({label: loadTimeData.getString('preferredNetworks'),
456 command: callback, 456 command: callback,
457 data: list}); 457 data: list});
458 } 458 }
459 459
460 var networkGroup = this.ownerDocument.createElement('div'); 460 var networkGroup = this.ownerDocument.createElement('div');
461 networkGroup.className = 'network-menu-group'; 461 networkGroup.className = 'network-menu-group';
462 var empty = true; 462 var empty = true;
463 list = this.data.networkList; 463 list = this.data.networkList;
464 if (list) { 464 if (list) {
465 for (var i = 0; i < list.length; i++) { 465 for (var i = 0; i < list.length; i++) {
466 var data = list[i]; 466 var data = list[i];
467 if (!data.connected && !data.connecting) { 467 if (!data.connected && !data.connecting) {
468 if (data.networkType != Constants.TYPE_ETHERNET) { 468 if (data.networkType != Constants.TYPE_ETHERNET) {
469 if (data.networkType == Constants.TYPE_CELLULAR) { 469 if (data.networkType == Constants.TYPE_CELLULAR) {
470 // Test if cellular network has an activated data plan. 470 // Test if cellular network has an activated data plan.
471 var activate = data.needs_new_plan || 471 var activate = data.needs_new_plan ||
472 (data.activation_state != 472 (data.activation_state !=
473 Constants.ACTIVATION_STATE_ACTIVATED && 473 Constants.ACTIVATION_STATE_ACTIVATED &&
474 data.activation_state != 474 data.activation_state !=
475 Constants.ACTIVATION_STATE_ACTIVATING); 475 Constants.ACTIVATION_STATE_ACTIVATING);
476 var cmd = activate ? 'activate' : 'connect'; 476 var cmd = activate ? 'activate' : 'connect';
477 this.createConnectCallback_(networkGroup, data, cmd); 477 this.createConnectCallback_(networkGroup, data, cmd);
478 } else { 478 } else {
479 this.createConnectCallback_(networkGroup, data); 479 this.createConnectCallback_(networkGroup, data);
480 } 480 }
481 empty = false; 481 empty = false;
482 } 482 }
483 } else if (data.connected) { 483 } else if (data.connected) {
484 addendum.push({label: localStrings.getString('networkOptions'), 484 addendum.push({label: loadTimeData.getString('networkOptions'),
485 command: 'options', 485 command: 'options',
486 data: data}); 486 data: data});
487 if (data.networkType == Constants.TYPE_VPN) { 487 if (data.networkType == Constants.TYPE_VPN) {
488 // Add separator 488 // Add separator
489 addendum.push({}); 489 addendum.push({});
490 var i18nKey = 'disconnectNetwork'; 490 var i18nKey = 'disconnectNetwork';
491 addendum.push({label: localStrings.getString(i18nKey), 491 addendum.push({label: loadTimeData.getString(i18nKey),
492 command: 'disconnect', 492 command: 'disconnect',
493 data: data}); 493 data: data});
494 } 494 }
495 if (data.networkType != Constants.TYPE_ETHERNET) { 495 if (data.networkType != Constants.TYPE_ETHERNET) {
496 var onlineMessage = this.ownerDocument.createElement('div'); 496 var onlineMessage = this.ownerDocument.createElement('div');
497 onlineMessage.textContent = 497 onlineMessage.textContent =
498 localStrings.getString('networkOnline'); 498 loadTimeData.getString('networkOnline');
499 onlineMessage.className = 'network-menu-header'; 499 onlineMessage.className = 'network-menu-header';
500 menu.insertBefore(onlineMessage, menu.firstChild); 500 menu.insertBefore(onlineMessage, menu.firstChild);
501 } 501 }
502 } 502 }
503 } 503 }
504 } 504 }
505 if (this.data_.key == 'wifi' || this.data_.key == 'cellular') { 505 if (this.data_.key == 'wifi' || this.data_.key == 'cellular') {
506 addendum.push({}); 506 addendum.push({});
507 if (this.data_.key == 'wifi') { 507 if (this.data_.key == 'wifi') {
508 addendum.push({label: localStrings.getString('turnOffWifi'), 508 addendum.push({label: loadTimeData.getString('turnOffWifi'),
509 command: function() { 509 command: function() {
510 chrome.send('disableWifi'); 510 chrome.send('disableWifi');
511 }, 511 },
512 data: {}}); 512 data: {}});
513 } else if (this.data_.key == 'cellular') { 513 } else if (this.data_.key == 'cellular') {
514 addendum.push({label: localStrings.getString('turnOffCellular'), 514 addendum.push({label: loadTimeData.getString('turnOffCellular'),
515 command: function() { 515 command: function() {
516 chrome.send('disableCellular'); 516 chrome.send('disableCellular');
517 }, 517 },
518 data: {}}); 518 data: {}});
519 } 519 }
520 } 520 }
521 if (!empty) 521 if (!empty)
522 menu.appendChild(networkGroup); 522 menu.appendChild(networkGroup);
523 if (addendum.length > 0) { 523 if (addendum.length > 0) {
524 var separator = false; 524 var separator = false;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 * Adds a menu item for connecting to a network. 590 * Adds a menu item for connecting to a network.
591 * @param {!Element} menu Parent menu. 591 * @param {!Element} menu Parent menu.
592 * @param {Object} data Description of the network. 592 * @param {Object} data Description of the network.
593 * @param {string=} opt_connect Optional connection method. 593 * @param {string=} opt_connect Optional connection method.
594 * @private 594 * @private
595 */ 595 */
596 createConnectCallback_: function(menu, data, opt_connect) { 596 createConnectCallback_: function(menu, data, opt_connect) {
597 var cmd = opt_connect ? opt_connect : 'connect'; 597 var cmd = opt_connect ? opt_connect : 'connect';
598 var label = data.networkName; 598 var label = data.networkName;
599 if (cmd == 'activate') { 599 if (cmd == 'activate') {
600 label = localStrings.getString('activateNetwork'); 600 label = loadTimeData.getString('activateNetwork');
601 label = label.replace('$1', data.networkName); 601 label = label.replace('$1', data.networkName);
602 } 602 }
603 var menuItem = this.createCallback_(menu, 603 var menuItem = this.createCallback_(menu,
604 data, 604 data,
605 label, 605 label,
606 cmd); 606 cmd);
607 menuItem.style.backgroundImage = url(data.iconURL); 607 menuItem.style.backgroundImage = url(data.iconURL);
608 608
609 if (data.policyManaged) 609 if (data.policyManaged)
610 menuItem.appendChild(new ManagedNetworkIndicator()); 610 menuItem.appendChild(new ManagedNetworkIndicator());
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 List.prototype.decorate.call(this); 669 List.prototype.decorate.call(this);
670 this.autoExpand = true; 670 this.autoExpand = true;
671 this.addEventListener('blur', this.onBlur_); 671 this.addEventListener('blur', this.onBlur_);
672 this.dataModel = new ArrayDataModel([]); 672 this.dataModel = new ArrayDataModel([]);
673 673
674 // Wi-Fi control is always visible. 674 // Wi-Fi control is always visible.
675 this.update({key: 'wifi', networkList: []}); 675 this.update({key: 'wifi', networkList: []});
676 676
677 if (airplaneModeAvailable_()) { 677 if (airplaneModeAvailable_()) {
678 this.update({key: 'airplaneMode', 678 this.update({key: 'airplaneMode',
679 subtitle: localStrings.getString('airplaneModeLabel'), 679 subtitle: loadTimeData.getString('airplaneModeLabel'),
680 command: function() { 680 command: function() {
681 chrome.send('toggleAirplaneMode'); 681 chrome.send('toggleAirplaneMode');
682 }}); 682 }});
683 } 683 }
684 684
685 // Add connection control. 685 // Add connection control.
686 var addConnection = function(type) { 686 var addConnection = function(type) {
687 var callback = function() { 687 var callback = function() {
688 chrome.send('networkCommand', 688 chrome.send('networkCommand',
689 [String(type), '?', 'connect']); 689 [String(type), '?', 'connect']);
690 } 690 }
691 return callback; 691 return callback;
692 } 692 }
693 this.update({key: 'addConnection', 693 this.update({key: 'addConnection',
694 iconType: 'add-connection', 694 iconType: 'add-connection',
695 menu: [{label: localStrings.getString('addConnectionWifi'), 695 menu: [{label: loadTimeData.getString('addConnectionWifi'),
696 command: addConnection(Constants.TYPE_WIFI)}, 696 command: addConnection(Constants.TYPE_WIFI)},
697 {label: localStrings.getString('addConnectionVPN'), 697 {label: loadTimeData.getString('addConnectionVPN'),
698 command: addConnection(Constants.TYPE_VPN)}] 698 command: addConnection(Constants.TYPE_VPN)}]
699 }); 699 });
700 700
701 var prefs = options.Preferences.getInstance(); 701 var prefs = options.Preferences.getInstance();
702 prefs.addEventListener('cros.signed.data_roaming_enabled', 702 prefs.addEventListener('cros.signed.data_roaming_enabled',
703 function(event) { 703 function(event) {
704 enableDataRoaming_ = event.value && event.value['value'] != 704 enableDataRoaming_ = event.value && event.value['value'] !=
705 undefined ? event.value['value'] : event.value; 705 undefined ? event.value['value'] : event.value;
706 }); 706 });
707 }, 707 },
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 // Only show Ethernet control if connected. 834 // Only show Ethernet control if connected.
835 var ethernetConnection = getConnection_(data.wiredList); 835 var ethernetConnection = getConnection_(data.wiredList);
836 if (ethernetConnection) { 836 if (ethernetConnection) {
837 var type = String(Constants.TYPE_ETHERNET); 837 var type = String(Constants.TYPE_ETHERNET);
838 var path = ethernetConnection.servicePath; 838 var path = ethernetConnection.servicePath;
839 var ethernetOptions = function() { 839 var ethernetOptions = function() {
840 chrome.send('networkCommand', 840 chrome.send('networkCommand',
841 [type, path, 'options']); 841 [type, path, 'options']);
842 }; 842 };
843 networkList.update({key: 'ethernet', 843 networkList.update({key: 'ethernet',
844 subtitle: localStrings.getString('networkConnected'), 844 subtitle: loadTimeData.getString('networkConnected'),
845 iconURL: ethernetConnection.iconURL, 845 iconURL: ethernetConnection.iconURL,
846 command: ethernetOptions}); 846 command: ethernetOptions});
847 } else { 847 } else {
848 networkList.deleteItem('ethernet'); 848 networkList.deleteItem('ethernet');
849 } 849 }
850 850
851 if (data.wifiEnabled) { 851 if (data.wifiEnabled) {
852 loadData_('wifi', data.wirelessList, data.rememberedList); 852 loadData_('wifi', data.wirelessList, data.rememberedList);
853 } else { 853 } else {
854 var enableWifi = function() { 854 var enableWifi = function() {
855 chrome.send('enableWifi'); 855 chrome.send('enableWifi');
856 }; 856 };
857 networkList.update({key: 'wifi', 857 networkList.update({key: 'wifi',
858 subtitle: localStrings.getString('networkDisabled'), 858 subtitle: loadTimeData.getString('networkDisabled'),
859 iconType: 'wifi', 859 iconType: 'wifi',
860 command: enableWifi}); 860 command: enableWifi});
861 } 861 }
862 862
863 // Only show cellular control if available and not in airplane mode. 863 // Only show cellular control if available and not in airplane mode.
864 if (data.cellularAvailable && !data.airplaneMode) { 864 if (data.cellularAvailable && !data.airplaneMode) {
865 if (data.cellularEnabled) { 865 if (data.cellularEnabled) {
866 loadData_('cellular', data.wirelessList, data.rememberedList); 866 loadData_('cellular', data.wirelessList, data.rememberedList);
867 } else { 867 } else {
868 var subtitle = localStrings.getString('networkDisabled'); 868 var subtitle = loadTimeData.getString('networkDisabled');
869 var enableCellular = function() { 869 var enableCellular = function() {
870 chrome.send('enableCellular'); 870 chrome.send('enableCellular');
871 }; 871 };
872 networkList.update({key: 'cellular', 872 networkList.update({key: 'cellular',
873 subtitle: subtitle, 873 subtitle: subtitle,
874 iconType: 'cellular', 874 iconType: 'cellular',
875 command: enableCellular}); 875 command: enableCellular});
876 } 876 }
877 } else { 877 } else {
878 networkList.deleteItem('cellular'); 878 networkList.deleteItem('cellular');
(...skipping 20 matching lines...) Expand all
899 return el; 899 return el;
900 } 900 }
901 901
902 ManagedNetworkIndicator.prototype = { 902 ManagedNetworkIndicator.prototype = {
903 __proto__: ControlledSettingIndicator.prototype, 903 __proto__: ControlledSettingIndicator.prototype,
904 904
905 /** @inheritDoc */ 905 /** @inheritDoc */
906 decorate: function() { 906 decorate: function() {
907 ControlledSettingIndicator.prototype.decorate.call(this); 907 ControlledSettingIndicator.prototype.decorate.call(this);
908 this.controlledBy = 'policy'; 908 this.controlledBy = 'policy';
909 var policyLabel = localStrings.getString('managedNetwork'); 909 var policyLabel = loadTimeData.getString('managedNetwork');
910 this.setAttribute('textPolicy', policyLabel); 910 this.setAttribute('textPolicy', policyLabel);
911 this.className = 'controlled-setting-indicator'; 911 this.className = 'controlled-setting-indicator';
912 // The default popup clips to the bounds of the list of networks in the 912 // The default popup clips to the bounds of the list of networks in the
913 // drop-down because it has enforced size constraints with auto- 913 // drop-down because it has enforced size constraints with auto-
914 // scrolling. Use a tooltip in place of the bubble popup until the 914 // scrolling. Use a tooltip in place of the bubble popup until the
915 // clipping issues are resolved. 915 // clipping issues are resolved.
916 this.setAttribute('title', policyLabel); 916 this.setAttribute('title', policyLabel);
917 this.addEventListener('click', function(e) { 917 this.addEventListener('click', function(e) {
918 e.preventDefault(); 918 e.preventDefault();
919 e.stopPropagation(); 919 e.stopPropagation();
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 * Whether the Network list is disabled. Only used for display purpose. 1002 * Whether the Network list is disabled. Only used for display purpose.
1003 * @type {boolean} 1003 * @type {boolean}
1004 */ 1004 */
1005 cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR); 1005 cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR);
1006 1006
1007 // Export 1007 // Export
1008 return { 1008 return {
1009 NetworkList: NetworkList 1009 NetworkList: NetworkList
1010 }; 1010 };
1011 }); 1011 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698