| Index: chrome/browser/resources/options/sync_setup_overlay.js
|
| diff --git a/chrome/browser/resources/options/sync_setup_overlay.js b/chrome/browser/resources/options/sync_setup_overlay.js
|
| index 12dc97d09a2d2be0d6f2bd9686bafc238d464a86..6cbffb266be2d0795e850d3b961e2c8d8897071f 100644
|
| --- a/chrome/browser/resources/options/sync_setup_overlay.js
|
| +++ b/chrome/browser/resources/options/sync_setup_overlay.js
|
| @@ -64,9 +64,9 @@ cr.define('options', function() {
|
| * @class
|
| */
|
| function SyncSetupOverlay() {
|
| - Page.call(this, 'syncSetup',
|
| - loadTimeData.getString('syncSetupOverlayTabTitle'),
|
| - 'sync-setup-overlay');
|
| + Page.call(
|
| + this, 'syncSetup', loadTimeData.getString('syncSetupOverlayTabTitle'),
|
| + 'sync-setup-overlay');
|
| }
|
|
|
| cr.addSingletonGetter(SyncSetupOverlay);
|
| @@ -132,14 +132,14 @@ cr.define('options', function() {
|
|
|
| $('basic-encryption-option').onchange =
|
| $('full-encryption-option').onchange = function() {
|
| - self.onEncryptionRadioChanged_();
|
| - };
|
| + self.onEncryptionRadioChanged_();
|
| + };
|
| $('choose-datatypes-cancel').onclick =
|
| $('confirm-everything-cancel').onclick =
|
| - $('stop-syncing-cancel').onclick =
|
| - $('sync-spinner-cancel').onclick = function() {
|
| - self.closeOverlay_();
|
| - };
|
| + $('stop-syncing-cancel').onclick =
|
| + $('sync-spinner-cancel').onclick = function() {
|
| + self.closeOverlay_();
|
| + };
|
| $('activity-controls').onclick = function() {
|
| chrome.metricsPrivate.recordUserAction(
|
| 'Signin_AccountSettings_GoogleActivityControlsClicked');
|
| @@ -152,8 +152,8 @@ cr.define('options', function() {
|
| self.closeOverlay_();
|
| };
|
| $('stop-syncing-ok').onclick = function() {
|
| - var deleteProfile = $('delete-profile') != undefined &&
|
| - $('delete-profile').checked;
|
| + var deleteProfile =
|
| + $('delete-profile') != undefined && $('delete-profile').checked;
|
| chrome.send('SyncSetupStopSyncing', [deleteProfile]);
|
| self.closeOverlay_();
|
| };
|
| @@ -198,8 +198,8 @@ cr.define('options', function() {
|
| var visible = $('full-encryption-option').checked;
|
| // TODO(dbeam): should sync-custom-passphrase-container be hidden instead?
|
| $('sync-custom-passphrase').hidden = !visible;
|
| - chrome.send('coreOptionsUserMetricsAction',
|
| - ['Options_SyncSetEncryption']);
|
| + chrome.send(
|
| + 'coreOptionsUserMetricsAction', ['Options_SyncSetEncryption']);
|
| },
|
|
|
| /**
|
| @@ -211,8 +211,9 @@ cr.define('options', function() {
|
| checkAllDataTypeCheckboxes_: function(value) {
|
| // Only check / uncheck the visible ones (since there's no way to uncheck
|
| // / check the invisible ones).
|
| - var checkboxes = $('choose-data-types-body').querySelectorAll(
|
| - '.sync-type-checkbox:not([hidden]) input');
|
| + var checkboxes =
|
| + $('choose-data-types-body')
|
| + .querySelectorAll('.sync-type-checkbox:not([hidden]) input');
|
| for (var i = 0; i < checkboxes.length; i++) {
|
| checkboxes[i].checked = value;
|
| }
|
| @@ -276,7 +277,7 @@ cr.define('options', function() {
|
| mismatchError.hidden = true;
|
|
|
| if (!$('full-encryption-option').checked ||
|
| - $('basic-encryption-option').disabled) {
|
| + $('basic-encryption-option').disabled) {
|
| return true;
|
| }
|
|
|
| @@ -314,8 +315,9 @@ cr.define('options', function() {
|
| // the passphrase and finish configuration. If the user has enabled
|
| // encrypted datatypes, the PSS will prompt again specifying that the
|
| // passphrase failed.
|
| - } else if (!$('basic-encryption-option').disabled &&
|
| - $('full-encryption-option').checked) {
|
| + } else if (
|
| + !$('basic-encryption-option').disabled &&
|
| + $('full-encryption-option').checked) {
|
| // The user is setting a custom passphrase for the first time.
|
| if (!this.checkPassphraseMatch_())
|
| return;
|
| @@ -334,7 +336,7 @@ cr.define('options', function() {
|
| // These values need to be kept in sync with where they are read in
|
| // sync_setup_handler.cc:GetConfiguration().
|
| var syncAll = $('sync-select-datatypes').selectedIndex ==
|
| - options.DataTypeSelection.SYNC_EVERYTHING;
|
| + options.DataTypeSelection.SYNC_EVERYTHING;
|
| var autofillSynced = syncAll || $('autofill-checkbox').checked;
|
| var result = JSON.stringify({
|
| 'syncAllDataTypes': syncAll,
|
| @@ -377,8 +379,8 @@ cr.define('options', function() {
|
| $('customize-link').hidden = disabled;
|
| $('customize-link').disabled = disabled;
|
| $('customize-link').onclick = disabled ? null : function() {
|
| - SyncSetupOverlay.showCustomizePage(self.syncConfigureArgs_,
|
| - options.DataTypeSelection.SYNC_EVERYTHING);
|
| + SyncSetupOverlay.showCustomizePage(
|
| + self.syncConfigureArgs_, options.DataTypeSelection.SYNC_EVERYTHING);
|
| return false;
|
| };
|
| },
|
| @@ -490,8 +492,8 @@ cr.define('options', function() {
|
| var input = assertInstanceof(e.target, HTMLInputElement);
|
| assert(input.type == 'checkbox');
|
| this.dataTypeBoxesChecked_[input.id] = input.checked;
|
| - chrome.send('coreOptionsUserMetricsAction',
|
| - ['Options_SyncToggleDataType']);
|
| + chrome.send(
|
| + 'coreOptionsUserMetricsAction', ['Options_SyncToggleDataType']);
|
| },
|
|
|
| /**
|
| @@ -566,8 +568,8 @@ cr.define('options', function() {
|
| // OK button, or to the passphrase field if a passphrase is required.
|
| this.usePassphrase_ = args.usePassphrase;
|
| var index = args.syncAllDataTypes ?
|
| - options.DataTypeSelection.SYNC_EVERYTHING :
|
| - options.DataTypeSelection.CHOOSE_WHAT_TO_SYNC;
|
| + options.DataTypeSelection.SYNC_EVERYTHING :
|
| + options.DataTypeSelection.CHOOSE_WHAT_TO_SYNC;
|
| this.showCustomizePage_(args, index);
|
| }
|
| },
|
| @@ -586,8 +588,7 @@ cr.define('options', function() {
|
|
|
| /** @private */
|
| showSyncEverythingPage_: function() {
|
| - chrome.send('coreOptionsUserMetricsAction',
|
| - ['Options_SyncSetDefault']);
|
| + chrome.send('coreOptionsUserMetricsAction', ['Options_SyncSetDefault']);
|
|
|
| $('confirm-sync-preferences').hidden = false;
|
| $('customize-sync-preferences').hidden = true;
|
| @@ -755,18 +756,24 @@ cr.define('options', function() {
|
| }
|
| };
|
|
|
| - forEach(page.getElementsByClassName('reset-hidden'),
|
| - function(elt) { elt.hidden = true; });
|
| - forEach(page.getElementsByClassName('reset-shown'),
|
| - function(elt) { elt.hidden = false; });
|
| - forEach(page.getElementsByClassName('reset-disabled'),
|
| - function(elt) { elt.disabled = true; });
|
| - forEach(page.getElementsByClassName('reset-enabled'),
|
| - function(elt) { elt.disabled = false; });
|
| - forEach(page.getElementsByClassName('reset-value'),
|
| - function(elt) { elt.value = ''; });
|
| - forEach(page.getElementsByClassName('reset-opaque'),
|
| - function(elt) { elt.classList.remove('transparent'); });
|
| + forEach(page.getElementsByClassName('reset-hidden'), function(elt) {
|
| + elt.hidden = true;
|
| + });
|
| + forEach(page.getElementsByClassName('reset-shown'), function(elt) {
|
| + elt.hidden = false;
|
| + });
|
| + forEach(page.getElementsByClassName('reset-disabled'), function(elt) {
|
| + elt.disabled = true;
|
| + });
|
| + forEach(page.getElementsByClassName('reset-enabled'), function(elt) {
|
| + elt.disabled = false;
|
| + });
|
| + forEach(page.getElementsByClassName('reset-value'), function(elt) {
|
| + elt.value = '';
|
| + });
|
| + forEach(page.getElementsByClassName('reset-opaque'), function(elt) {
|
| + elt.classList.remove('transparent');
|
| + });
|
| },
|
|
|
| /**
|
| @@ -827,7 +834,5 @@ cr.define('options', function() {
|
| ]);
|
|
|
| // Export
|
| - return {
|
| - SyncSetupOverlay: SyncSetupOverlay
|
| - };
|
| + return {SyncSetupOverlay: SyncSetupOverlay};
|
| });
|
|
|