Title: [191054] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 191054
- Author
- matthew_han...@apple.com
- Date
- 2015-10-14 11:49:36 -0700 (Wed, 14 Oct 2015)
Log Message
Merge r190246. rdar://problem/22939682
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (191053 => 191054)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-10-14 18:49:35 UTC (rev 191053)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-10-14 18:49:36 UTC (rev 191054)
@@ -1,3 +1,18 @@
+2015-10-13 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r190246. rdar://problem/22939682
+
+ 2015-09-25 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Reloading the page causes the inspector tab to switch back to "Resources" tab
+ https://bugs.webkit.org/show_bug.cgi?id=148732
+
+ Reviewed by Darin Adler.
+
+ * UserInterface/Views/ResourceSidebarPanel.js:
+ (WebInspector.ResourceSidebarPanel.prototype._scriptsCleared):
+ Suppress selection of sibiling tree elements when removing extra folders.
+
2015-10-08 Lucas Forschler <lforsch...@apple.com>
Merge r189011. rdar://problem/22801999
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (191053 => 191054)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2015-10-14 18:49:35 UTC (rev 191053)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2015-10-14 18:49:36 UTC (rev 191054)
@@ -311,21 +311,24 @@
_scriptsCleared(event)
{
+ const suppressOnDeselect = true;
+ const suppressSelectSibling = true;
+
if (this._extensionScriptsFolderTreeElement) {
if (this._extensionScriptsFolderTreeElement.parent)
- this._extensionScriptsFolderTreeElement.parent.removeChild(this._extensionScriptsFolderTreeElement);
+ this._extensionScriptsFolderTreeElement.parent.removeChild(this._extensionScriptsFolderTreeElement, suppressOnDeselect, suppressSelectSibling);
this._extensionScriptsFolderTreeElement = null;
}
if (this._extraScriptsFolderTreeElement) {
if (this._extraScriptsFolderTreeElement.parent)
- this._extraScriptsFolderTreeElement.parent.removeChild(this._extraScriptsFolderTreeElement);
+ this._extraScriptsFolderTreeElement.parent.removeChild(this._extraScriptsFolderTreeElement, suppressOnDeselect, suppressSelectSibling);
this._extraScriptsFolderTreeElement = null;
}
if (this._anonymousScriptsFolderTreeElement) {
if (this._anonymousScriptsFolderTreeElement.parent)
- this._anonymousScriptsFolderTreeElement.parent.removeChild(this._anonymousScriptsFolderTreeElement);
+ this._anonymousScriptsFolderTreeElement.parent.removeChild(this._anonymousScriptsFolderTreeElement, suppressOnDeselect, suppressSelectSibling);
this._anonymousScriptsFolderTreeElement = null;
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
