| Index: chrome/browser/resources/options/content_settings_exceptions_area.js
|
| diff --git a/chrome/browser/resources/options/content_settings_exceptions_area.js b/chrome/browser/resources/options/content_settings_exceptions_area.js
|
| index 9043b0886e4dff83ce2ba70f8f2616f87aa8b4b0..45b592d41e3345f3720c27fb60c96c52d76d03f3 100644
|
| --- a/chrome/browser/resources/options/content_settings_exceptions_area.js
|
| +++ b/chrome/browser/resources/options/content_settings_exceptions_area.js
|
| @@ -4,7 +4,7 @@
|
|
|
| cr.define('options.contentSettings', function() {
|
| /** @const */ var ControlledSettingIndicator =
|
| - options.ControlledSettingIndicator;
|
| + options.ControlledSettingIndicator;
|
| /** @const */ var InlineEditableItemList = options.InlineEditableItemList;
|
| /** @const */ var InlineEditableItem = options.InlineEditableItem;
|
| /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
|
| @@ -16,12 +16,10 @@ cr.define('options.contentSettings', function() {
|
| */
|
| function isEditableType(contentType) {
|
| // Exceptions of the following lists are not editable for now.
|
| - return !(contentType == 'location' ||
|
| - contentType == 'media-stream-mic' ||
|
| - contentType == 'media-stream-camera' ||
|
| - contentType == 'midi-sysex' ||
|
| - contentType == 'zoomlevels' ||
|
| - isChosenObjectType(contentType));
|
| + return !(
|
| + contentType == 'location' || contentType == 'media-stream-mic' ||
|
| + contentType == 'media-stream-camera' || contentType == 'midi-sysex' ||
|
| + contentType == 'zoomlevels' || isChosenObjectType(contentType));
|
| }
|
|
|
| /**
|
| @@ -140,8 +138,8 @@ cr.define('options.contentSettings', function() {
|
| this.contentElement.appendChild(select);
|
| }
|
| select.className = 'exception-setting';
|
| - select.setAttribute('aria-labelledby',
|
| - valueColumnForContentType(this.contentType));
|
| + select.setAttribute(
|
| + 'aria-labelledby', valueColumnForContentType(this.contentType));
|
|
|
| if (this.pattern)
|
| select.setAttribute('displaymode', 'edit');
|
| @@ -192,7 +190,8 @@ cr.define('options.contentSettings', function() {
|
| // or delete it.
|
| var controlledBy =
|
| this.dataItem.source && this.dataItem.source != 'preference' ?
|
| - this.dataItem.source : null;
|
| + this.dataItem.source :
|
| + null;
|
|
|
| if (controlledBy) {
|
| this.setAttribute('controlled-by', controlledBy);
|
| @@ -222,8 +221,9 @@ cr.define('options.contentSettings', function() {
|
| // Handle events on the editable nodes.
|
| input.oninput = function(event) {
|
| listItem.inputValidityKnown = false;
|
| - chrome.send('checkExceptionPatternValidity',
|
| - [listItem.contentType, listItem.mode, input.value]);
|
| + chrome.send(
|
| + 'checkExceptionPatternValidity',
|
| + [listItem.contentType, listItem.mode, input.value]);
|
| };
|
|
|
| // Listen for edit events.
|
| @@ -261,8 +261,8 @@ cr.define('options.contentSettings', function() {
|
| if (!this.isEmbeddingRule())
|
| return this.dataItem.origin;
|
|
|
| - return loadTimeData.getStringF('embeddedOnHost',
|
| - this.dataItem.embeddingOrigin);
|
| + return loadTimeData.getStringF(
|
| + 'embeddedOnHost', this.dataItem.embeddingOrigin);
|
| },
|
| set pattern(pattern) {
|
| if (!this.editable)
|
| @@ -413,12 +413,13 @@ cr.define('options.contentSettings', function() {
|
| // TODO(estade): this will need to be updated if geolocation/notifications
|
| // become editable.
|
| if (oldPattern != newPattern) {
|
| - chrome.send('removeException',
|
| - [this.contentType, this.mode, oldPattern]);
|
| + chrome.send(
|
| + 'removeException', [this.contentType, this.mode, oldPattern]);
|
| }
|
|
|
| - chrome.send('setException',
|
| - [this.contentType, this.mode, newPattern, newSetting]);
|
| + chrome.send(
|
| + 'setException',
|
| + [this.contentType, this.mode, newPattern, newSetting]);
|
| },
|
| };
|
|
|
| @@ -477,8 +478,9 @@ cr.define('options.contentSettings', function() {
|
| */
|
| finishEdit: function(newPattern, newSetting) {
|
| this.resetInput();
|
| - chrome.send('setException',
|
| - [this.contentType, this.mode, newPattern, newSetting]);
|
| + chrome.send(
|
| + 'setException',
|
| + [this.contentType, this.mode, newPattern, newSetting]);
|
| },
|
| };
|
|
|
| @@ -524,12 +526,10 @@ cr.define('options.contentSettings', function() {
|
| */
|
| createItem: function(entry) {
|
| if (entry) {
|
| - return new ExceptionsListItem(this.contentType,
|
| - this.mode,
|
| - entry);
|
| + return new ExceptionsListItem(this.contentType, this.mode, entry);
|
| } else {
|
| - var addRowItem = new ExceptionsAddRowListItem(this.contentType,
|
| - this.mode);
|
| + var addRowItem =
|
| + new ExceptionsAddRowListItem(this.contentType, this.mode);
|
| addRowItem.deletable = false;
|
| return addRowItem;
|
| }
|
| @@ -614,10 +614,10 @@ cr.define('options.contentSettings', function() {
|
| return;
|
|
|
| var dataItem = listItem.dataItem;
|
| - var params = [listItem.contentType,
|
| - listItem.mode,
|
| - dataItem.origin,
|
| - dataItem.embeddingOrigin];
|
| + var params = [
|
| + listItem.contentType, listItem.mode, dataItem.origin,
|
| + dataItem.embeddingOrigin
|
| + ];
|
|
|
| if (isChosenObjectType(this.contentType))
|
| params.push(dataItem.object);
|
| @@ -636,9 +636,10 @@ cr.define('options.contentSettings', function() {
|
| * @extends {cr.ui.pageManager.Page}
|
| */
|
| function ContentSettingsExceptionsArea() {
|
| - Page.call(this, 'contentExceptions',
|
| - loadTimeData.getString('contentSettingsPageTabTitle'),
|
| - 'content-settings-exceptions-area');
|
| + Page.call(
|
| + this, 'contentExceptions',
|
| + loadTimeData.getString('contentSettingsPageTabTitle'),
|
| + 'content-settings-exceptions-area');
|
| }
|
|
|
| cr.addSingletonGetter(ContentSettingsExceptionsArea);
|
|
|