Title: [152680] branches/safari-537-branch/Source/WebInspectorUI
- Revision
- 152680
- Author
- [email protected]
- Date
- 2013-07-15 17:08:44 -0700 (Mon, 15 Jul 2013)
Log Message
Merged r152588. <rdar://problem/14425513>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebInspectorUI/ChangeLog (152679 => 152680)
--- branches/safari-537-branch/Source/WebInspectorUI/ChangeLog 2013-07-16 00:04:16 UTC (rev 152679)
+++ branches/safari-537-branch/Source/WebInspectorUI/ChangeLog 2013-07-16 00:08:44 UTC (rev 152680)
@@ -1,3 +1,21 @@
+2013-07-15 Lucas Forschler <[email protected]>
+
+ Merge r152588
+
+ 2013-07-12 Seokju Kwon <[email protected]>
+
+ Web Inspector: Pass null for sidebarPanels and role in WebInspector.Sidebar()
+ https://bugs.webkit.org/show_bug.cgi?id=118589
+
+ Reviewed by Timothy Hatcher.
+
+ sidebarPanels : It is necessary to get correct argument after r152141.
+ Without this, error messages can be displayed.
+ role : Could pass null for it since default value is "group".
+
+ * UserInterface/Main.js:
+ (WebInspector.contentLoaded):
+
2013-07-09 Lucas Forschler <[email protected]>
Merge r152380
Modified: branches/safari-537-branch/Source/WebInspectorUI/UserInterface/Main.js (152679 => 152680)
--- branches/safari-537-branch/Source/WebInspectorUI/UserInterface/Main.js 2013-07-16 00:04:16 UTC (rev 152679)
+++ branches/safari-537-branch/Source/WebInspectorUI/UserInterface/Main.js 2013-07-16 00:08:44 UTC (rev 152680)
@@ -169,7 +169,7 @@
this.navigationSidebar.addEventListener(WebInspector.Sidebar.Event.WidthDidChange, this._sidebarWidthDidChange, this);
this.navigationSidebar.addEventListener(WebInspector.Sidebar.Event.SidebarPanelSelected, this._navigationSidebarPanelSelected, this);
- this.rightSidebar = this.detailsSidebar = new WebInspector.Sidebar(document.getElementById("details-sidebar"), WebInspector.Sidebar.Sides.Right, "group", WebInspector.UIString("Details"));
+ this.rightSidebar = this.detailsSidebar = new WebInspector.Sidebar(document.getElementById("details-sidebar"), WebInspector.Sidebar.Sides.Right, null, null, WebInspector.UIString("Details"));
this.detailsSidebar.addEventListener(WebInspector.Sidebar.Event.CollapsedStateDidChange, this._sidebarCollapsedStateDidChange, this);
this.detailsSidebar.addEventListener(WebInspector.Sidebar.Event.WidthDidChange, this._sidebarWidthDidChange, this);
this.detailsSidebar.addEventListener(WebInspector.Sidebar.Event.SidebarPanelSelected, this._detailsSidebarPanelSelected, this);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes