Title: [168788] branches/safari-538.34-branch/Source/WebInspectorUI
Diff
Modified: branches/safari-538.34-branch/Source/WebInspectorUI/ChangeLog (168787 => 168788)
--- branches/safari-538.34-branch/Source/WebInspectorUI/ChangeLog 2014-05-14 06:20:28 UTC (rev 168787)
+++ branches/safari-538.34-branch/Source/WebInspectorUI/ChangeLog 2014-05-14 06:21:54 UTC (rev 168788)
@@ -1,3 +1,26 @@
+2014-04-17 Lucas Forschler <[email protected]>
+
+ Merge r168484
+
+ 2014-05-08 Jono Wells <[email protected]>
+
+ Web Inspector: Selecting frame in debugger sidebar doesn't reveal code
+ https://bugs.webkit.org/show_bug.cgi?id=132112
+
+ Reviewed by Joseph Pecoraro.
+
+ WebInspector._revealAndSelectRepresentedObjectInNavigationSidebar was checking
+ only one of the two content trees in the DebuggerSidebarPanel instance. Added
+ base getter elementIsSelected to NavigationSidebarPanel and extended it in
+ DebuggerSidebarPanel.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector._revealAndSelectRepresentedObjectInNavigationSidebar): modified logic to check `selectedSidebarPanel.elementIsSelected`.
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.prototype.get elementIsSelected): Checks breakpoint and call stack trees.
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel.prototype.get elementIsSelected): Base implementation.
+
2014-05-06 Radu Stavila <[email protected]>
Web Inspector: [CSS Regions] Add the regionOversetChange event to the iOS 7.0 WebInspector UI
Modified: branches/safari-538.34-branch/Source/WebInspectorUI/UserInterface/Base/Main.js (168787 => 168788)
--- branches/safari-538.34-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-05-14 06:20:28 UTC (rev 168787)
+++ branches/safari-538.34-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-05-14 06:21:54 UTC (rev 168788)
@@ -916,12 +916,13 @@
return;
var treeElement = selectedSidebarPanel.treeElementForRepresentedObject(representedObject);
+
if (treeElement)
treeElement.revealAndSelect(true, false, true, true);
else if (selectedSidebarPanel.contentTreeOutline.selectedTreeElement)
selectedSidebarPanel.contentTreeOutline.selectedTreeElement.deselect(true);
- if (!selectedSidebarPanel.contentTreeOutline.selectedTreeElement)
+ if (!selectedSidebarPanel.hasSelectedElement)
selectedSidebarPanel.showDefaultContentView();
}
@@ -1826,7 +1827,7 @@
{
if (typeof listener.handleKeydownEvent !== "function")
return;
-
+
this._windowKeydownListeners.push(listener);
this._updateWindowKeydownListener();
@@ -1835,7 +1836,7 @@
WebInspector.removeWindowKeydownListener = function(listener)
{
this._windowKeydownListeners.remove(listener);
-
+
this._updateWindowKeydownListener();
};
Modified: branches/safari-538.34-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (168787 => 168788)
--- branches/safari-538.34-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2014-05-14 06:20:28 UTC (rev 168787)
+++ branches/safari-538.34-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2014-05-14 06:21:54 UTC (rev 168788)
@@ -129,6 +129,11 @@
// Public
+ get hasSelectedElement()
+ {
+ return !!this._breakpointsContentTreeOutline.selectedTreeElement || !!this._callStackContentTreeOutline.selectedTreeElement;
+ },
+
showDefaultContentView: function()
{
WebInspector.resourceSidebarPanel.showDefaultContentView();
@@ -211,7 +216,7 @@
this._debuggerPauseResumeButtonItem.enabled = true;
this._debuggerPauseResumeButtonItem.toggled = true;
this._debuggerStepOverButtonItem.enabled = true;
- this._debuggerStepIntoButtonItem.enabled = true;
+ this._debuggerStepIntoButtonItem.enabled = true;
},
_debuggerDidResume: function(event)
Modified: branches/safari-538.34-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (168787 => 168788)
--- branches/safari-538.34-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2014-05-14 06:20:28 UTC (rev 168787)
+++ branches/safari-538.34-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2014-05-14 06:21:54 UTC (rev 168788)
@@ -147,6 +147,11 @@
return this._contentTreeOutline;
},
+ get hasSelectedElement()
+ {
+ return !!this._contentTreeOutline.selectedTreeElement;
+ },
+
get filterBar()
{
return this._filterBar;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
