Sync UI: Use camelCase for variables sent to JS.

chrome/browser/resources/sync_setup_overlay.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
   /** @const */ var OptionsPage = options.OptionsPage;
 
   // Variable to track if a captcha challenge was issued. If this gets set to
   // true, it stays that way until we are told about successful login from
   // the browser.  This means subsequent errors (like invalid password) are
@@ skipping 203 matching lines @@
 
       // Don't allow the user to tweak the settings once we send the
       // configuration to the backend.
       this.setInputElementsDisabledState_(true);
       this.animateDisableLink_($('use-default-link'), true, null);
 
       // These values need to be kept in sync with where they are read in
       // SyncSetupFlow::GetDataTypeChoiceData().
       var result = JSON.stringify({
         'syncAllDataTypes': syncAll,
-        'sync_bookmarks': syncAll || $('bookmarks-checkbox').checked,
-        'sync_preferences': syncAll || $('preferences-checkbox').checked,
-        'sync_themes': syncAll || $('themes-checkbox').checked,
-        'sync_passwords': syncAll || $('passwords-checkbox').checked,
-        'sync_autofill': syncAll || $('autofill-checkbox').checked,
-        'sync_extensions': syncAll || $('extensions-checkbox').checked,
-        'sync_typed_urls': syncAll || $('typed-urls-checkbox').checked,
-        'sync_apps': syncAll || $('apps-checkbox').checked,
-        'sync_sessions': syncAll || $('sessions-checkbox').checked,
+        'bookmarksSynced': syncAll || $('bookmarks-checkbox').checked,
+        'preferencesSynced': syncAll || $('preferences-checkbox').checked,
+        'themesSynced': syncAll || $('themes-checkbox').checked,
+        'passwordsSynced': syncAll || $('passwords-checkbox').checked,
+        'autofillSynced': syncAll || $('autofill-checkbox').checked,
+        'extensionsSynced': syncAll || $('extensions-checkbox').checked,
+        'typedUrlsSynced': syncAll || $('typed-urls-checkbox').checked,
+        'appsSynced': syncAll || $('apps-checkbox').checked,
+        'sessionsSynced': syncAll || $('sessions-checkbox').checked,
         'encryptAllData': encryptAllData,
         'usePassphrase': usePassphrase,
         'isGooglePassphrase': googlePassphrase,
         'passphrase': customPassphrase
       });
       chrome.send('SyncSetupConfigure', [result]);
     },
 
     /**
      * Sets the disabled property of all input elements within the 'Customize
@@ skipping 35 matching lines @@
             return;
           elt.removeEventListener('webkitTransitionEnd', f);
           elt.classList.remove('transparent');
           elt.hidden = true;
         });
       } else {
         elt.hidden = false;
         elt.onclick = enabledFunction;
       }
     },
 

[Dan Beam, 2012/04/23 21:32:56]

@param {Object} args
(doesn't need to have every key documented)

[James Hawkins, 2012/04/24 16:53:58]

Done.

     setChooseDataTypesCheckboxes_: function(args) {
       var datatypeSelect = $('sync-select-datatypes');
       datatypeSelect.selectedIndex = args.syncAllDataTypes ? 0 : 1;
 
-      $('bookmarks-checkbox').checked = args.sync_bookmarks;
-      $('preferences-checkbox').checked = args.sync_preferences;
-      $('themes-checkbox').checked = args.sync_themes;
+      $('bookmarks-checkbox').checked = args.bookmarksSynced;
+      $('preferences-checkbox').checked = args.preferencesSynced;
+      $('themes-checkbox').checked = args.themesSynced;
 
-      if (args.passwords_registered) {
-        $('passwords-checkbox').checked = args.sync_passwords;
+      if (args.passwordsRegistered) {
+        $('passwords-checkbox').checked = args.passwordsSynced;
         $('passwords-item').hidden = false;
       } else {
         $('passwords-item').hidden = true;
       }
-      if (args.autofill_registered) {
-        $('autofill-checkbox').checked = args.sync_autofill;
+      if (args.autofillRegistered) {
+        $('autofill-checkbox').checked = args.autofillSynced;
         $('autofill-item').hidden = false;
       } else {
         $('autofill-item').hidden = true;
       }
-      if (args.extensions_registered) {
-        $('extensions-checkbox').checked = args.sync_extensions;
+      if (args.extensionsRegistered) {
+        $('extensions-checkbox').checked = args.extensionsSynced;
         $('extensions-item').hidden = false;
       } else {
         $('extensions-item').hidden = true;
       }
-      if (args.typed_urls_registered) {
-        $('typed-urls-checkbox').checked = args.sync_typed_urls;
+      if (args.typedUrlsRegistered) {
+        $('typed-urls-checkbox').checked = args.typedUrlsSynced;
         $('omnibox-item').hidden = false;
       } else {
         $('omnibox-item').hidden = true;
       }
-      if (args.apps_registered) {
-        $('apps-checkbox').checked = args.sync_apps;
+      if (args.appsRegistered) {
+        $('apps-checkbox').checked = args.appsSynced;
         $('apps-item').hidden = false;
       } else {
         $('apps-item').hidden = true;
       }
-      if (args.sessions_registered) {
-        $('sessions-checkbox').checked = args.sync_sessions;
+      if (args.sessionsRegistered) {
+        $('sessions-checkbox').checked = args.sessionsSynced;
         $('sessions-item').hidden = false;
       } else {
         $('sessions-item').hidden = true;
       }
 
       this.setCheckboxesToKeepEverythingSynced_(args.syncAllDataTypes);
     },
 
     setEncryptionRadios_: function(args) {
       if (args['encryptAllData']) {
@@ skipping 44 matching lines @@
       if (args) {
         this.setCheckboxesAndErrors_(args);
 
         this.useEncryptEverything_ = args['encryptAllData'];
 
         // Whether to display the 'Sync everything' confirmation page or the
         // customize data types page.
         var syncAllDataTypes = args['syncAllDataTypes'];
         this.usePassphrase_ = args['usePassphrase'];
         if (args['showSyncEverythingPage'] == false || this.usePassphrase_ ||
-            syncAllDataTypes == false || args['show_passphrase']) {
+            syncAllDataTypes == false || args['showPassphrase']) {
           this.showCustomizePage_(args, syncAllDataTypes);
         } else {
           this.showSyncEverythingPage_();
         }
       }
     },
 
     showSpinner_: function() {
       this.resetPage_('sync-setup-spinner');
       $('sync-setup-spinner').hidden = false;
@@ skipping 47 matching lines @@
       if (args['usePassphrase'])
         $('normal-body').hidden = false;
       else
         $('google-passphrase-needed-body').hidden = false;
 
       $('passphrase-learn-more').hidden = false;
       // Warn the user about their incorrect passphrase if we need a passphrase
       // and the passphrase field is non-empty (meaning they tried to set it
       // previously but failed).
       $('incorrect-passphrase').hidden =
-          !(args['usePassphrase'] && args['passphrase_failed']);
+          !(args['usePassphrase'] && args['passphraseFailed']);
 
       $('sync-passphrase-warning').hidden = false;
       $('passphrase').focus();
     },
 
     /** @private */
     showCustomizePage_: function(args, syncEverything) {
       $('confirm-sync-preferences').hidden = true;
       $('customize-sync-preferences').hidden = false;
 
       $('sync-custom-passphrase-container').hidden = false;
       $('sync-existing-passphrase-container').hidden = true;
 
       // If the user has selected the 'Customize' page on initial set up, it's
       // likely he intends to change the data types. Select the
       // 'Choose data types' option in this case.
       var index = syncEverything ? 0 : 1;
       $('sync-select-datatypes').selectedIndex = index;
       this.setDataTypeCheckboxesEnabled_(!syncEverything);
 
       // The passphrase input may need to take over focus from the OK button, so
       // set focus before that logic.
       $('choose-datatypes-ok').focus();
 
-      if (args && args['show_passphrase']) {
+      if (args && args['showPassphrase']) {

[Dan Beam, 2012/04/23 21:32:56]

can you change these to .key instead of ['key']?

[James Hawkins, 2012/04/24 16:53:58]

Done.

         this.showPassphraseContainer_(args);
       } else {
         // We only show the 'Use Default' link if we're not prompting for an
         // existing passphrase.
         var self = this;
         this.animateDisableLink_($('use-default-link'), false, function() {
           self.showSyncEverythingPage_();
         });
       }
     },
@@ skipping 153 matching lines @@
       var f = $('gaia-login-form');
       var email = $('gaia-email');
       var passwd = $('gaia-passwd');
       if (f) {
         if (args.user != undefined) {
           if (email.value != args.user)
             passwd.value = ''; // Reset the password field
           email.value = args.user;
         }
 
-        if (!args.editable_user) {
+        if (!args.editableUser) {
           $('email-row').hidden = true;
           var span = $('email-readonly');
           span.textContent = email.value;
           $('email-readonly-row').hidden = false;
           $('create-account-div').hidden = true;
         }
 
         f.accessCode.disabled = true;
       }
 
       if (1 == args.error) {
-        var access_code = $('access-code');
-        if (access_code.value) {
+        var accessCode = $('access-code');
+        if (accessCode.value) {
           $('errormsg-0-access-code').hidden = false;
           this.showAccessCodeRequired_();
         } else {
           $('errormsg-1-password').hidden = false;
         }
-        this.setBlurbError_(args.error_message);
+        this.setBlurbError_(args.errorMessage);
       } else if (3 == args.error) {
         $('errormsg-0-connection').hidden = false;
-        this.setBlurbError_(args.error_message);
+        this.setBlurbError_(args.errorMessage);
       } else if (4 == args.error) {
         this.showCaptcha_(args);
       } else if (7 == args.error) {
         this.setBlurbError_(localStrings.getString('serviceUnavailableError'));
       } else if (8 == args.error) {
         this.showAccessCodeRequired_();
-      } else if (args.error_message) {
-        this.setBlurbError_(args.error_message);
+      } else if (args.errorMessage) {
+        this.setBlurbError_(args.errorMessage);
       }
 
       if (args.fatalError) {
         $('errormsg-fatal').hidden = false;
         $('sign-in').disabled = true;
         return;
       }
 
       $('sign-in').disabled = false;
       $('sign-in').value = templateData['signin'];
       this.loginSetFocus_();
     },
 
     resetErrorVisibility_: function() {
       $('errormsg-0-email').hidden = true;
       $('errormsg-0-password').hidden = true;
       $('errormsg-1-password').hidden = true;
       $('errormsg-0-connection').hidden = true;
       $('errormsg-0-access-code').hidden = true;
     },
 
-    setBlurbError_: function(error_message) {
+    setBlurbError_: function(errorMessage) {
       if (this.captchaChallengeActive_)
         return;  // No blurb in captcha challenge mode.
 
-      if (error_message) {
+      if (errorMessage) {
         $('error-signing-in').hidden = true;
         $('error-custom').hidden = false;
-        $('error-custom').textContent = error_message;
+        $('error-custom').textContent = errorMessage;
       } else {
         $('error-signing-in').hidden = false;
         $('error-custom').hidden = true;
       }
 
       $('top-blurb-error').hidden = false;
       $('gaia-email').disabled = false;
       $('gaia-passwd').disabled = false;
     },
 
@@ skipping 48 matching lines @@
       $('access-code').disabled = true;
 
       this.setThrobbersVisible_(true);
 
       var f = $('gaia-login-form');
       var email = $('gaia-email');
       var passwd = $('gaia-passwd');
       var result = JSON.stringify({'user' : email.value,
                                    'pass' : passwd.value,
                                    'captcha' : f.captchaValue.value,
-                                   'access_code' : f.accessCode.value});
+                                   'accessCode' : f.accessCode.value});
       $('sign-in').disabled = true;
       chrome.send('SyncSetupSubmitAuth', [result]);
     },
 
     showSuccessAndClose_: function() {
       $('sign-in').value = localStrings.getString('loginSuccess');
       setTimeout(this.closeOverlay_, 1600);
     },
 
     showSuccessAndSettingUp_: function() {
@@ skipping 83 matching lines @@
 
   SyncSetupOverlay.showStopSyncingUI = function() {
     SyncSetupOverlay.getInstance().showStopSyncingUI_();
   };
 
   // Export
   return {
     SyncSetupOverlay: SyncSetupOverlay
   };
 });