Title: [193067] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193067
- Author
- [email protected]
- Date
- 2015-12-03 10:42:36 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r188007. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193066 => 193067)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:42:31 UTC (rev 193066)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:42:36 UTC (rev 193067)
@@ -1,5 +1,19 @@
2015-12-02 Timothy Hatcher <[email protected]>
+ Merge r188007. rdar://problem/23221163
+
+ 2015-08-05 Matt Baker <[email protected]>
+
+ Web Inspector: REGRESSION (r187900): Breakpoint context menu is broken in Debugger tab
+ https://bugs.webkit.org/show_bug.cgi?id=147699
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ Skip only the separator and "Reveal in Debugger tab" menu items.
+
+2015-12-02 Timothy Hatcher <[email protected]>
+
Merge r188006. rdar://problem/23221163
2015-08-05 Brian Burg <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (193066 => 193067)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-12-03 18:42:31 UTC (rev 193066)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-12-03 18:42:36 UTC (rev 193067)
@@ -1022,12 +1022,16 @@
}
// Single breakpoint.
- if (breakpoints.length === 1 && !WebInspector.isShowingDebuggerTab()) {
+ if (breakpoints.length === 1) {
var breakpoint = breakpoints[0];
breakpoint.appendContextMenuItems(contextMenu, event.target);
- contextMenu.appendSeparator();
- contextMenu.appendItem(WebInspector.UIString("Reveal in Debugger Tab"), revealInSidebar);
+
+ if (!WebInspector.isShowingDebuggerTab()) {
+ contextMenu.appendSeparator();
+ contextMenu.appendItem(WebInspector.UIString("Reveal in Debugger Tab"), revealInSidebar);
+ }
+
contextMenu.show();
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
