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.contentSettings', function() { | 5 cr.define('options.contentSettings', function() { |
6 /** @const */ var ControlledSettingIndicator = | 6 /** @const */ var ControlledSettingIndicator = |
7 options.ControlledSettingIndicator; | 7 options.ControlledSettingIndicator; |
8 /** @const */ var InlineEditableItemList = options.InlineEditableItemList; | 8 /** @const */ var InlineEditableItemList = options.InlineEditableItemList; |
9 /** @const */ var InlineEditableItem = options.InlineEditableItem; | 9 /** @const */ var InlineEditableItem = options.InlineEditableItem; |
10 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel; | 10 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel; |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 | 353 |
354 this.finishEdit(newPattern, newSetting); | 354 this.finishEdit(newPattern, newSetting); |
355 }, | 355 }, |
356 | 356 |
357 /** | 357 /** |
358 * Called when cancelling an edit; resets the control states. | 358 * Called when cancelling an edit; resets the control states. |
359 * | 359 * |
360 * @param {Event} e The cancel event. | 360 * @param {Event} e The cancel event. |
361 * @private | 361 * @private |
362 */ | 362 */ |
363 onEditCancelled_: function() { | 363 onEditCancelled_: function(e) { |
364 this.updateEditables(); | 364 this.updateEditables(); |
365 this.setPatternValid(true); | 365 this.setPatternValid(true); |
366 }, | 366 }, |
367 | 367 |
368 /** | 368 /** |
369 * Editing is complete; update the model. | 369 * Editing is complete; update the model. |
370 * | 370 * |
371 * @param {string} newPattern The pattern that the user entered. | 371 * @param {string} newPattern The pattern that the user entered. |
372 * @param {string} newSetting The setting the user chose. | 372 * @param {string} newSetting The setting the user chose. |
373 */ | 373 */ |
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
685 } | 685 } |
686 }; | 686 }; |
687 | 687 |
688 return { | 688 return { |
689 ExceptionsListItem: ExceptionsListItem, | 689 ExceptionsListItem: ExceptionsListItem, |
690 ExceptionsAddRowListItem: ExceptionsAddRowListItem, | 690 ExceptionsAddRowListItem: ExceptionsAddRowListItem, |
691 ExceptionsList: ExceptionsList, | 691 ExceptionsList: ExceptionsList, |
692 ContentSettingsExceptionsArea: ContentSettingsExceptionsArea, | 692 ContentSettingsExceptionsArea: ContentSettingsExceptionsArea, |
693 }; | 693 }; |
694 }); | 694 }); |
OLD | NEW |