| Index: chrome/browser/resources/options/manage_profile_overlay.js
|
| diff --git a/chrome/browser/resources/options/manage_profile_overlay.js b/chrome/browser/resources/options/manage_profile_overlay.js
|
| index ae97f12f87c3da19e4da92d6a4f7db5d84bf5d01..654de3717c6b570111e8a2cf006a2c3f863d4210 100644
|
| --- a/chrome/browser/resources/options/manage_profile_overlay.js
|
| +++ b/chrome/browser/resources/options/manage_profile_overlay.js
|
| @@ -108,34 +108,25 @@ cr.define('options', function() {
|
| },
|
|
|
| /**
|
| - * Determine whether |name| is valid; i.e. not equal to any other profile
|
| - * name.
|
| - * @param {string} name The profile name to validate.
|
| - * @return true if the name is not equal to any other profile name.
|
| + * Display the error bubble, with |errorText| in the bubble.
|
| + * @param {string} errorText The localized string id to display as an error.
|
| * @private
|
| */
|
| - isNameValid_: function(name) {
|
| - // if the name hasn't changed, assume it is valid.
|
| - if (name == this.profileInfo_.name)
|
| - return true;
|
| + showErrorBubble_: function(errorText) {
|
| + var nameErrorEl = $('manage-profile-error-bubble');
|
| + nameErrorEl.classList.remove('hiding');
|
| + nameErrorEl.textContent = localStrings.getString(errorText);
|
|
|
| - return this.profileNames_[name] == undefined;
|
| + $('manage-profile-ok').disabled = true;
|
| },
|
|
|
| /**
|
| - * Update the UI elements accordingly if the profile name is valid/invalid.
|
| - * @param {boolean} isValid True if the UI should be updated as if the name
|
| - * were valid.
|
| + * Hide the error bubble.
|
| * @private
|
| */
|
| - setNameIsValid_: function(isValid) {
|
| - var dupeNameErrorEl = $('manage-profile-duplicate-name-error');
|
| - if (isValid)
|
| - dupeNameErrorEl.classList.add('hiding');
|
| - else
|
| - dupeNameErrorEl.classList.remove('hiding');
|
| -
|
| - $('manage-profile-ok').disabled = !isValid;
|
| + hideErrorBubble_: function() {
|
| + $('manage-profile-name-error').classList.add('hiding');
|
| + $('manage-profile-ok').disabled = false;
|
| },
|
|
|
| /**
|
| @@ -144,11 +135,23 @@ cr.define('options', function() {
|
| * @private
|
| */
|
| onNameChanged_: function(event) {
|
| - this.setNameIsValid_(this.isNameValid_(event.target.value));
|
| + var newName = event.target.value;
|
| + var oldName = this.profileInfo_.name;
|
| +
|
| + if (newName == oldName) {
|
| + this.hideErrorBubble_();
|
| + } else if (this.profileNames_[newName] != undefined) {
|
| + this.showErrorBubble_('manageProfilesDuplicateNameError');
|
| + } else {
|
| + this.hideErrorBubble_();
|
| +
|
| + var nameIsValid = $('manage-profile-name').validity.valid;
|
| + $('manage-profile-ok').disabled = !nameIsValid;
|
| + }
|
| },
|
|
|
| /**
|
| - * Called when the user clicks "OK". Saves the newly changed profile info.
|
| + * Called when the user clicks "OK". Save the newly changed profile info.
|
| * @private
|
| */
|
| submitManageChanges_: function() {
|
| @@ -167,7 +170,7 @@ cr.define('options', function() {
|
| ManageProfileOverlay.setProfileInfo(profileInfo);
|
| $('manage-profile-overlay-manage').hidden = false;
|
| $('manage-profile-overlay-delete').hidden = true;
|
| - ManageProfileOverlay.getInstance().setNameIsValid_(true);
|
| + ManageProfileOverlay.getInstance().hideErrorBubble_();
|
|
|
| // Intentionally don't show the URL in the location bar as we don't want
|
| // people trying to navigate here by hand.
|
|
|