Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1127)

Unified Diff: Source/devtools/front_end/sources/SourcesPanel.js

Issue 1179183002: DevTools: border and toolbar colors from Max's mocks. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: review comments addressed. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/devtools/front_end/sidebarPane.css ('k') | Source/devtools/front_end/sources/sourcesPanel.css » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/sources/SourcesPanel.js
diff --git a/Source/devtools/front_end/sources/SourcesPanel.js b/Source/devtools/front_end/sources/SourcesPanel.js
index 26a6b253f7574fdfad53505d67cae7c61e771f3b..c1a70375100e24a417cfc9c9a11a2200b8900f4d 100644
--- a/Source/devtools/front_end/sources/SourcesPanel.js
+++ b/Source/devtools/front_end/sources/SourcesPanel.js
@@ -253,9 +253,11 @@ WebInspector.SourcesPanel.prototype = {
this.sidebarPanes.xhrBreakpoints.highlightBreakpoint(details.auxData["breakpointURL"]);
this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on a XMLHttpRequest."));
} else if (details.reason === WebInspector.DebuggerModel.BreakReason.Exception) {
- this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on exception: '%s'.", details.auxData["description"].split("\n", 1)[0]));
+ var description = details.auxData["description"] || "";
+ this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on exception: '%s'.", description.split("\n", 1)[0]));
} else if (details.reason === WebInspector.DebuggerModel.BreakReason.PromiseRejection) {
- this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on promise rejection: '%s'.", details.auxData["description"].split("\n", 1)[0]));
+ var description = details.auxData["description"] || "";
+ this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on promise rejection: '%s'.", description.split("\n", 1)[0]));
} else if (details.reason === WebInspector.DebuggerModel.BreakReason.Assert) {
this.sidebarPanes.callstack.setStatus(WebInspector.UIString("Paused on assertion."));
} else if (details.reason === WebInspector.DebuggerModel.BreakReason.CSPViolation) {
@@ -1149,11 +1151,11 @@ WebInspector.SourcesPanel.prototype = {
// Create vertical box with stack.
var vbox = new WebInspector.VBox();
vbox.element.appendChild(this._debugToolbarDrawer);
- vbox.element.appendChild(this._debugToolbar.element);
vbox.setMinimumAndPreferredSizes(25, 25, WebInspector.SourcesPanel.minToolbarWidth, 100);
var sidebarPaneStack = new WebInspector.SidebarPaneStack();
sidebarPaneStack.element.classList.add("flex-auto");
sidebarPaneStack.show(vbox.element);
+ vbox.element.appendChild(this._debugToolbar.element);
if (!vertically) {
// Populate the only stack.
« no previous file with comments | « Source/devtools/front_end/sidebarPane.css ('k') | Source/devtools/front_end/sources/sourcesPanel.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698