| Index: third_party/WebKit/Source/devtools/front_end/settings/FrameworkBlackboxSettingsTab.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/settings/FrameworkBlackboxSettingsTab.js b/third_party/WebKit/Source/devtools/front_end/settings/FrameworkBlackboxSettingsTab.js
|
| index 9f36e24de81e6d97a5cd9439e3d58a9fd94ef1f0..7b80e84614ec71e64cab30f785f1131dcb2cfc00 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/settings/FrameworkBlackboxSettingsTab.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/settings/FrameworkBlackboxSettingsTab.js
|
| @@ -3,181 +3,175 @@
|
| * Use of this source code is governed by a BSD-style license that can be
|
| * found in the LICENSE file.
|
| */
|
| -
|
| /**
|
| - * @constructor
|
| - * @extends {WebInspector.VBox}
|
| * @implements {WebInspector.ListWidget.Delegate}
|
| + * @unrestricted
|
| */
|
| -WebInspector.FrameworkBlackboxSettingsTab = function()
|
| -{
|
| - WebInspector.VBox.call(this, true);
|
| - this.registerRequiredCSS("settings/frameworkBlackboxSettingsTab.css");
|
| +WebInspector.FrameworkBlackboxSettingsTab = class extends WebInspector.VBox {
|
| + constructor() {
|
| + super(true);
|
| + this.registerRequiredCSS('settings/frameworkBlackboxSettingsTab.css');
|
|
|
| - this.contentElement.createChild("div", "header").textContent = WebInspector.UIString("Framework Blackbox Patterns");
|
| - this.contentElement.createChild("div", "blackbox-content-scripts").appendChild(WebInspector.SettingsUI.createSettingCheckbox(WebInspector.UIString("Blackbox content scripts"), WebInspector.moduleSetting("skipContentScripts"), true));
|
| + this.contentElement.createChild('div', 'header').textContent = WebInspector.UIString('Framework Blackbox Patterns');
|
| + this.contentElement.createChild('div', 'blackbox-content-scripts')
|
| + .appendChild(WebInspector.SettingsUI.createSettingCheckbox(
|
| + WebInspector.UIString('Blackbox content scripts'), WebInspector.moduleSetting('skipContentScripts'), true));
|
|
|
| - this._blackboxLabel = WebInspector.UIString("Blackbox");
|
| - this._disabledLabel = WebInspector.UIString("Disabled");
|
| + this._blackboxLabel = WebInspector.UIString('Blackbox');
|
| + this._disabledLabel = WebInspector.UIString('Disabled');
|
|
|
| this._list = new WebInspector.ListWidget(this);
|
| - this._list.element.classList.add("blackbox-list");
|
| - this._list.registerRequiredCSS("settings/frameworkBlackboxSettingsTab.css");
|
| + this._list.element.classList.add('blackbox-list');
|
| + this._list.registerRequiredCSS('settings/frameworkBlackboxSettingsTab.css');
|
|
|
| - var placeholder = createElementWithClass("div", "blackbox-list-empty");
|
| - placeholder.textContent = WebInspector.UIString("No blackboxed patterns");
|
| + var placeholder = createElementWithClass('div', 'blackbox-list-empty');
|
| + placeholder.textContent = WebInspector.UIString('No blackboxed patterns');
|
| this._list.setEmptyPlaceholder(placeholder);
|
| this._list.show(this.contentElement);
|
| - var addPatternButton = createTextButton(WebInspector.UIString("Add pattern..."), this._addButtonClicked.bind(this), "add-button");
|
| + var addPatternButton =
|
| + createTextButton(WebInspector.UIString('Add pattern...'), this._addButtonClicked.bind(this), 'add-button');
|
| this.contentElement.appendChild(addPatternButton);
|
|
|
| - this._setting = WebInspector.moduleSetting("skipStackFramesPattern");
|
| + this._setting = WebInspector.moduleSetting('skipStackFramesPattern');
|
| this._setting.addChangeListener(this._settingUpdated, this);
|
|
|
| this.setDefaultFocusedElement(addPatternButton);
|
| this.contentElement.tabIndex = 0;
|
| -};
|
| -
|
| -WebInspector.FrameworkBlackboxSettingsTab.prototype = {
|
| - wasShown: function()
|
| - {
|
| - WebInspector.SettingsTab.prototype.wasShown.call(this);
|
| - this._settingUpdated();
|
| - },
|
| -
|
| - _settingUpdated: function()
|
| - {
|
| - this._list.clear();
|
| - var patterns = this._setting.getAsArray();
|
| - for (var i = 0; i < patterns.length; ++i)
|
| - this._list.appendItem(patterns[i], true);
|
| - },
|
| -
|
| - _addButtonClicked: function()
|
| - {
|
| - this._list.addNewItem(this._setting.getAsArray().length, {pattern: "", disabled: false});
|
| - },
|
| -
|
| - /**
|
| - * @override
|
| - * @param {*} item
|
| - * @param {boolean} editable
|
| - * @return {!Element}
|
| - */
|
| - renderItem: function(item, editable)
|
| - {
|
| - var element = createElementWithClass("div", "blackbox-list-item");
|
| - var pattern = element.createChild("div", "blackbox-pattern");
|
| - pattern.textContent = item.pattern;
|
| - pattern.title = item.pattern;
|
| - element.createChild("div", "blackbox-separator");
|
| - element.createChild("div", "blackbox-behavior").textContent = item.disabled ? this._disabledLabel : this._blackboxLabel;
|
| - if (item.disabled)
|
| - element.classList.add("blackbox-disabled");
|
| - return element;
|
| - },
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + */
|
| + wasShown() {
|
| + super.wasShown();
|
| + this._settingUpdated();
|
| + }
|
| +
|
| + _settingUpdated() {
|
| + this._list.clear();
|
| + var patterns = this._setting.getAsArray();
|
| + for (var i = 0; i < patterns.length; ++i)
|
| + this._list.appendItem(patterns[i], true);
|
| + }
|
| +
|
| + _addButtonClicked() {
|
| + this._list.addNewItem(this._setting.getAsArray().length, {pattern: '', disabled: false});
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + * @param {*} item
|
| + * @param {boolean} editable
|
| + * @return {!Element}
|
| + */
|
| + renderItem(item, editable) {
|
| + var element = createElementWithClass('div', 'blackbox-list-item');
|
| + var pattern = element.createChild('div', 'blackbox-pattern');
|
| + pattern.textContent = item.pattern;
|
| + pattern.title = item.pattern;
|
| + element.createChild('div', 'blackbox-separator');
|
| + element.createChild('div', 'blackbox-behavior').textContent =
|
| + item.disabled ? this._disabledLabel : this._blackboxLabel;
|
| + if (item.disabled)
|
| + element.classList.add('blackbox-disabled');
|
| + return element;
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + * @param {*} item
|
| + * @param {number} index
|
| + */
|
| + removeItemRequested(item, index) {
|
| + var patterns = this._setting.getAsArray();
|
| + patterns.splice(index, 1);
|
| + this._setting.setAsArray(patterns);
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + * @param {*} item
|
| + * @param {!WebInspector.ListWidget.Editor} editor
|
| + * @param {boolean} isNew
|
| + */
|
| + commitEdit(item, editor, isNew) {
|
| + item.pattern = editor.control('pattern').value.trim();
|
| + item.disabled = editor.control('behavior').value === this._disabledLabel;
|
| +
|
| + var list = this._setting.getAsArray();
|
| + if (isNew)
|
| + list.push(item);
|
| + this._setting.setAsArray(list);
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + * @param {*} item
|
| + * @return {!WebInspector.ListWidget.Editor}
|
| + */
|
| + beginEdit(item) {
|
| + var editor = this._createEditor();
|
| + editor.control('pattern').value = item.pattern;
|
| + editor.control('behavior').value = item.disabled ? this._disabledLabel : this._blackboxLabel;
|
| + return editor;
|
| + }
|
| +
|
| + /**
|
| + * @return {!WebInspector.ListWidget.Editor}
|
| + */
|
| + _createEditor() {
|
| + if (this._editor)
|
| + return this._editor;
|
| +
|
| + var editor = new WebInspector.ListWidget.Editor();
|
| + this._editor = editor;
|
| + var content = editor.contentElement();
|
| +
|
| + var titles = content.createChild('div', 'blackbox-edit-row');
|
| + titles.createChild('div', 'blackbox-pattern').textContent = WebInspector.UIString('Pattern');
|
| + titles.createChild('div', 'blackbox-separator blackbox-separator-invisible');
|
| + titles.createChild('div', 'blackbox-behavior').textContent = WebInspector.UIString('Behavior');
|
| +
|
| + var fields = content.createChild('div', 'blackbox-edit-row');
|
| + fields.createChild('div', 'blackbox-pattern')
|
| + .appendChild(editor.createInput('pattern', 'text', '/framework\\.js$', patternValidator.bind(this)));
|
| + fields.createChild('div', 'blackbox-separator blackbox-separator-invisible');
|
| + fields.createChild('div', 'blackbox-behavior')
|
| + .appendChild(editor.createSelect('behavior', [this._blackboxLabel, this._disabledLabel], behaviorValidator));
|
| +
|
| + return editor;
|
|
|
| /**
|
| - * @override
|
| * @param {*} item
|
| * @param {number} index
|
| + * @param {!HTMLInputElement|!HTMLSelectElement} input
|
| + * @this {WebInspector.FrameworkBlackboxSettingsTab}
|
| + * @return {boolean}
|
| */
|
| - removeItemRequested: function(item, index)
|
| - {
|
| - var patterns = this._setting.getAsArray();
|
| - patterns.splice(index, 1);
|
| - this._setting.setAsArray(patterns);
|
| - },
|
| -
|
| - /**
|
| - * @override
|
| - * @param {*} item
|
| - * @param {!WebInspector.ListWidget.Editor} editor
|
| - * @param {boolean} isNew
|
| - */
|
| - commitEdit: function(item, editor, isNew)
|
| - {
|
| - item.pattern = editor.control("pattern").value.trim();
|
| - item.disabled = editor.control("behavior").value === this._disabledLabel;
|
| -
|
| - var list = this._setting.getAsArray();
|
| - if (isNew)
|
| - list.push(item);
|
| - this._setting.setAsArray(list);
|
| - },
|
| + function patternValidator(item, index, input) {
|
| + var pattern = input.value.trim();
|
| + var patterns = this._setting.getAsArray();
|
| + for (var i = 0; i < patterns.length; ++i) {
|
| + if (i !== index && patterns[i].pattern === pattern)
|
| + return false;
|
| + }
|
| +
|
| + var regex;
|
| + try {
|
| + regex = new RegExp(pattern);
|
| + } catch (e) {
|
| + }
|
| + return !!(pattern && regex);
|
| + }
|
|
|
| /**
|
| - * @override
|
| * @param {*} item
|
| - * @return {!WebInspector.ListWidget.Editor}
|
| - */
|
| - beginEdit: function(item)
|
| - {
|
| - var editor = this._createEditor();
|
| - editor.control("pattern").value = item.pattern;
|
| - editor.control("behavior").value = item.disabled ? this._disabledLabel : this._blackboxLabel;
|
| - return editor;
|
| - },
|
| -
|
| - /**
|
| - * @return {!WebInspector.ListWidget.Editor}
|
| + * @param {number} index
|
| + * @param {!HTMLInputElement|!HTMLSelectElement} input
|
| + * @return {boolean}
|
| */
|
| - _createEditor: function()
|
| - {
|
| - if (this._editor)
|
| - return this._editor;
|
| -
|
| - var editor = new WebInspector.ListWidget.Editor();
|
| - this._editor = editor;
|
| - var content = editor.contentElement();
|
| -
|
| - var titles = content.createChild("div", "blackbox-edit-row");
|
| - titles.createChild("div", "blackbox-pattern").textContent = WebInspector.UIString("Pattern");
|
| - titles.createChild("div", "blackbox-separator blackbox-separator-invisible");
|
| - titles.createChild("div", "blackbox-behavior").textContent = WebInspector.UIString("Behavior");
|
| -
|
| - var fields = content.createChild("div", "blackbox-edit-row");
|
| - fields.createChild("div", "blackbox-pattern").appendChild(editor.createInput("pattern", "text", "/framework\\.js$", patternValidator.bind(this)));
|
| - fields.createChild("div", "blackbox-separator blackbox-separator-invisible");
|
| - fields.createChild("div", "blackbox-behavior").appendChild(editor.createSelect("behavior", [this._blackboxLabel, this._disabledLabel], behaviorValidator));
|
| -
|
| - return editor;
|
| -
|
| - /**
|
| - * @param {*} item
|
| - * @param {number} index
|
| - * @param {!HTMLInputElement|!HTMLSelectElement} input
|
| - * @this {WebInspector.FrameworkBlackboxSettingsTab}
|
| - * @return {boolean}
|
| - */
|
| - function patternValidator(item, index, input)
|
| - {
|
| - var pattern = input.value.trim();
|
| - var patterns = this._setting.getAsArray();
|
| - for (var i = 0; i < patterns.length; ++i) {
|
| - if (i !== index && patterns[i].pattern === pattern)
|
| - return false;
|
| - }
|
| -
|
| - var regex;
|
| - try {
|
| - regex = new RegExp(pattern);
|
| - } catch (e) {
|
| - }
|
| - return !!(pattern && regex);
|
| - }
|
| -
|
| - /**
|
| - * @param {*} item
|
| - * @param {number} index
|
| - * @param {!HTMLInputElement|!HTMLSelectElement} input
|
| - * @return {boolean}
|
| - */
|
| - function behaviorValidator(item, index, input)
|
| - {
|
| - return true;
|
| - }
|
| - },
|
| -
|
| - __proto__: WebInspector.VBox.prototype
|
| + function behaviorValidator(item, index, input) {
|
| + return true;
|
| + }
|
| + }
|
| };
|
|
|