| Index: chrome/browser/resources/extensions/extension_error_overlay.js
|
| diff --git a/chrome/browser/resources/extensions/extension_error_overlay.js b/chrome/browser/resources/extensions/extension_error_overlay.js
|
| index 244a45e53c69e89d498a297d7851992cbe671612..1c4a001633a7d9a42a30738ae049a4caaa5e9cd0 100644
|
| --- a/chrome/browser/resources/extensions/extension_error_overlay.js
|
| +++ b/chrome/browser/resources/extensions/extension_error_overlay.js
|
| @@ -30,7 +30,8 @@ cr.define('extensions', function() {
|
| */
|
| function getRelativeUrl(url, extensionUrl) {
|
| return url.substring(0, extensionUrl.length) == extensionUrl ?
|
| - url.substring(extensionUrl.length) : url;
|
| + url.substring(extensionUrl.length) :
|
| + url;
|
| }
|
|
|
| /**
|
| @@ -40,9 +41,10 @@ cr.define('extensions', function() {
|
| * @extends {HTMLDivElement}
|
| */
|
| function RuntimeErrorContent() {
|
| - var contentArea = $('template-collection-extension-error-overlay').
|
| - querySelector('.extension-error-overlay-runtime-content').
|
| - cloneNode(true);
|
| + var contentArea =
|
| + $('template-collection-extension-error-overlay')
|
| + .querySelector('.extension-error-overlay-runtime-content')
|
| + .cloneNode(true);
|
| contentArea.__proto__ = RuntimeErrorContent.prototype;
|
| contentArea.init();
|
| return contentArea;
|
| @@ -101,7 +103,7 @@ cr.define('extensions', function() {
|
| * @type {HTMLElement}
|
| * @private
|
| */
|
| - this.stackTrace_ = /** @type {HTMLElement} */(
|
| + this.stackTrace_ = /** @type {HTMLElement} */ (
|
| this.querySelector('.extension-error-overlay-stack-trace-list'));
|
| assert(this.stackTrace_);
|
|
|
| @@ -110,7 +112,7 @@ cr.define('extensions', function() {
|
| * @type {HTMLElement}
|
| * @private
|
| */
|
| - this.contextUrl_ = /** @type {HTMLElement} */(
|
| + this.contextUrl_ = /** @type {HTMLElement} */ (
|
| this.querySelector('.extension-error-overlay-context-url'));
|
| assert(this.contextUrl_);
|
| },
|
| @@ -180,8 +182,9 @@ cr.define('extensions', function() {
|
| // The description is a human-readable summation of the frame, in the
|
| // form "<relative_url>:<line_number> (function)", e.g.
|
| // "myfile.js:25 (myFunction)".
|
| - var description = getRelativeUrl(frame.url,
|
| - assert(this.extensionUrl_)) + ':' + frame.lineNumber;
|
| + var description =
|
| + getRelativeUrl(frame.url, assert(this.extensionUrl_)) + ':' +
|
| + frame.lineNumber;
|
| if (frame.functionName) {
|
| var functionName = frame.functionName == '(anonymous function)' ?
|
| loadTimeData.getString('extensionErrorOverlayAnonymousFunction') :
|
| @@ -198,12 +201,12 @@ cr.define('extensions', function() {
|
| this.setActiveFrame_(frameNode);
|
|
|
| // Request the file source with the section highlighted.
|
| - extensions.ExtensionErrorOverlay.getInstance().requestFileSource(
|
| - {extensionId: this.error_.extensionId,
|
| - message: this.error_.message,
|
| - pathSuffix: getRelativeUrl(frame.url,
|
| - assert(this.extensionUrl_)),
|
| - lineNumber: frame.lineNumber});
|
| + extensions.ExtensionErrorOverlay.getInstance().requestFileSource({
|
| + extensionId: this.error_.extensionId,
|
| + message: this.error_.message,
|
| + pathSuffix: getRelativeUrl(frame.url, assert(this.extensionUrl_)),
|
| + lineNumber: frame.lineNumber
|
| + });
|
| }.bind(this, frame, frameNode));
|
|
|
| this.stackTrace_.appendChild(frameNode);
|
| @@ -215,8 +218,8 @@ cr.define('extensions', function() {
|
| // internal frames.)
|
| if (this.stackTrace_.children.length > 0) {
|
| this.stackTrace_.hidden = false;
|
| - this.setActiveFrame_(assertInstanceof(this.stackTrace_.firstChild,
|
| - HTMLElement));
|
| + this.setActiveFrame_(
|
| + assertInstanceof(this.stackTrace_.firstChild, HTMLElement));
|
| }
|
| },
|
|
|
| @@ -227,12 +230,13 @@ cr.define('extensions', function() {
|
| var stackFrame =
|
| this.error_.stackTrace[this.currentFrameNode_.indexIntoTrace];
|
|
|
| - chrome.developerPrivate.openDevTools(
|
| - {renderProcessId: this.error_.renderProcessId || -1,
|
| - renderViewId: this.error_.renderViewId || -1,
|
| - url: stackFrame.url,
|
| - lineNumber: stackFrame.lineNumber || 0,
|
| - columnNumber: stackFrame.columnNumber || 0});
|
| + chrome.developerPrivate.openDevTools({
|
| + renderProcessId: this.error_.renderProcessId || -1,
|
| + renderViewId: this.error_.renderViewId || -1,
|
| + url: stackFrame.url,
|
| + lineNumber: stackFrame.lineNumber || 0,
|
| + columnNumber: stackFrame.columnNumber || 0
|
| + });
|
| }
|
| };
|
|
|
| @@ -272,7 +276,7 @@ cr.define('extensions', function() {
|
| */
|
| ExtensionErrorOverlay.canLoadFileSource = function(file, extensionUrl) {
|
| return file.substr(0, extensionUrl.length) == extensionUrl ||
|
| - file.toLowerCase() == ExtensionErrorOverlay.MANIFEST_FILENAME_;
|
| + file.toLowerCase() == ExtensionErrorOverlay.MANIFEST_FILENAME_;
|
| };
|
|
|
| cr.addSingletonGetter(ExtensionErrorOverlay);
|
| @@ -298,18 +302,18 @@ cr.define('extensions', function() {
|
| cr.ui.overlay.globalInitialization();
|
| overlay.addEventListener('cancelOverlay', this.handleDismiss_.bind(this));
|
|
|
| - $('extension-error-overlay-dismiss').addEventListener('click',
|
| - function() {
|
| - cr.dispatchSimpleEvent(overlay, 'cancelOverlay');
|
| - });
|
| + $('extension-error-overlay-dismiss')
|
| + .addEventListener('click', function() {
|
| + cr.dispatchSimpleEvent(overlay, 'cancelOverlay');
|
| + });
|
|
|
| /**
|
| * The element of the full overlay.
|
| * @type {HTMLDivElement}
|
| * @private
|
| */
|
| - this.overlayDiv_ = /** @type {HTMLDivElement} */(
|
| - $('extension-error-overlay'));
|
| + this.overlayDiv_ =
|
| + /** @type {HTMLDivElement} */ ($('extension-error-overlay'));
|
|
|
| /**
|
| * The portion of the overlay which shows the code relating to the error
|
| @@ -336,10 +340,10 @@ cr.define('extensions', function() {
|
| * @type {HTMLButtonElement}
|
| * @private
|
| */
|
| - this.openDevtoolsButton_ = /** @type {HTMLButtonElement} */(
|
| + this.openDevtoolsButton_ = /** @type {HTMLButtonElement} */ (
|
| $('extension-error-overlay-devtools-button'));
|
| this.openDevtoolsButton_.addEventListener('click', function() {
|
| - this.runtimeErrorContent_.openDevtools();
|
| + this.runtimeErrorContent_.openDevtools();
|
| }.bind(this));
|
| },
|
|
|
| @@ -401,9 +405,8 @@ cr.define('extensions', function() {
|
| // Set or hide runtime content.
|
| if (error.type == chrome.developerPrivate.ErrorType.RUNTIME) {
|
| this.runtimeErrorContent_.setError(error, extensionUrl);
|
| - this.overlayDiv_.querySelector('.content-area').insertBefore(
|
| - this.runtimeErrorContent_,
|
| - this.codeDiv_.nextSibling);
|
| + this.overlayDiv_.querySelector('.content-area')
|
| + .insertBefore(this.runtimeErrorContent_, this.codeDiv_.nextSibling);
|
| this.openDevtoolsButton_.hidden = false;
|
| this.openDevtoolsButton_.disabled = !error.canInspect;
|
| } else {
|
| @@ -414,8 +417,10 @@ cr.define('extensions', function() {
|
| // the file is unreadable.
|
| if (ExtensionErrorOverlay.canLoadFileSource(error.source, extensionUrl)) {
|
| // Use pathname instead of relativeUrl.
|
| - var requestFileSourceArgs = {extensionId: error.extensionId,
|
| - message: error.message};
|
| + var requestFileSourceArgs = {
|
| + extensionId: error.extensionId,
|
| + message: error.message
|
| + };
|
| switch (error.type) {
|
| case chrome.developerPrivate.ErrorType.MANIFEST:
|
| requestFileSourceArgs.pathSuffix = error.source;
|
| @@ -428,7 +433,8 @@ cr.define('extensions', function() {
|
| requestFileSourceArgs.pathSuffix = pathname;
|
| requestFileSourceArgs.lineNumber =
|
| error.stackTrace && error.stackTrace[0] ?
|
| - error.stackTrace[0].lineNumber : 0;
|
| + error.stackTrace[0].lineNumber :
|
| + 0;
|
| break;
|
| default:
|
| assertNotReached();
|
| @@ -450,17 +456,18 @@ cr.define('extensions', function() {
|
| * @param {string} extensionName The name of the extension.
|
| */
|
| setErrorsAndShowOverlay: function(errors, extensionId, extensionName) {
|
| - document.querySelector(
|
| - '#extension-error-overlay .extension-error-overlay-title').
|
| - textContent = extensionName;
|
| + document
|
| + .querySelector(
|
| + '#extension-error-overlay .extension-error-overlay-title')
|
| + .textContent = extensionName;
|
| var errorsDiv = this.overlayDiv_.querySelector('.extension-error-list');
|
| var extensionErrors =
|
| new extensions.ExtensionErrorList(errors, extensionId);
|
| errorsDiv.parentNode.replaceChild(extensionErrors, errorsDiv);
|
| - extensionErrors.addEventListener('activeExtensionErrorChanged',
|
| - function(e) {
|
| - this.setActiveError_(e.detail);
|
| - }.bind(this));
|
| + extensionErrors.addEventListener(
|
| + 'activeExtensionErrorChanged', function(e) {
|
| + this.setActiveError_(e.detail);
|
| + }.bind(this));
|
|
|
| if (errors.length > 0)
|
| this.setActiveError_(errors[0]);
|
| @@ -494,7 +501,5 @@ cr.define('extensions', function() {
|
| };
|
|
|
| // Export
|
| - return {
|
| - ExtensionErrorOverlay: ExtensionErrorOverlay
|
| - };
|
| + return {ExtensionErrorOverlay: ExtensionErrorOverlay};
|
| });
|
|
|