Title: [200684] branches/safari-602.1.32-branch/Source/WebInspectorUI
- Revision
- 200684
- Author
- bshaf...@apple.com
- Date
- 2016-05-11 01:19:22 -0700 (Wed, 11 May 2016)
Log Message
Merged r200649. rdar://problem/26207064
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog (200683 => 200684)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-11 08:18:36 UTC (rev 200683)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-11 08:19:22 UTC (rev 200684)
@@ -1,5 +1,22 @@
2016-05-11 Babak Shafiei <bshaf...@apple.com>
+ Merge r200649.
+
+ 2016-05-10 Matt Baker <mattba...@apple.com>
+
+ Web Inspector: Debugger sidebar should refresh when Debug UI enabled/disabled
+ https://bugs.webkit.org/show_bug.cgi?id=157540
+ <rdar://problem/26207064>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.prototype._scriptRemoved.removeScript):
+ (WebInspector.DebuggerSidebarPanel.prototype._scriptRemoved):
+ Remove element from both tree outlines, if it exists.
+
+2016-05-11 Babak Shafiei <bshaf...@apple.com>
+
Merge r200644.
2016-05-10 Matt Baker <mattba...@apple.com>
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (200683 => 200684)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-05-11 08:18:36 UTC (rev 200683)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-05-11 08:19:22 UTC (rev 200684)
@@ -484,12 +484,16 @@
_scriptRemoved(event)
{
+ function removeScript(script, treeOutline)
+ {
+ let scriptTreeElement = treeOutline.getCachedTreeElement(script);
+ if (scriptTreeElement)
+ scriptTreeElement.parent.removeChild(scriptTreeElement);
+ }
+
let script = event.data.script;
- let scriptTreeElement = this._breakpointsContentTreeOutline.getCachedTreeElement(script);
- if (!scriptTreeElement)
- return;
-
- scriptTreeElement.parent.removeChild(scriptTreeElement);
+ removeScript(script, this._breakpointsContentTreeOutline);
+ removeScript(script, this._scriptsContentTreeOutline);
}
_scriptsCleared(event)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
