Title: [172775] branches/safari-600.1-branch/Source/WebInspectorUI
- Revision
- 172775
- Author
- [email protected]
- Date
- 2014-08-19 16:12:54 -0700 (Tue, 19 Aug 2014)
Log Message
Merge r172650. <rdar://problem/18034356>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172774 => 172775)
--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 23:09:56 UTC (rev 172774)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 23:12:54 UTC (rev 172775)
@@ -1,5 +1,19 @@
2014-08-19 Dana Burkart <[email protected]>
+ Merge r172650. <rdar://problem/18034356>
+
+ 2014-08-15 Timothy Hatcher <[email protected]>
+
+ Web Inspector: Probe details sidebar data grids do not show data
+ https://bugs.webkit.org/show_bug.cgi?id=135992
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/ProbeSetDataGrid.js:
+ (WebInspector.ProbeSetDataGrid): Make the DataGrid be inline to show the data correctly.
+
+2014-08-19 Dana Burkart <[email protected]>
+
Merge r172640. <rdar://problem/18025668>
2014-08-15 Timothy Hatcher <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js (172774 => 172775)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js 2014-08-19 23:09:56 UTC (rev 172774)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js 2014-08-19 23:12:54 UTC (rev 172775)
@@ -34,8 +34,11 @@
var probeTitle = probe._expression_ || WebInspector.UIString("(uninitialized)");
columnsData[probe.id] = { title: probeTitle };
}
+
WebInspector.DataGrid.call(this, columnsData);
+ this.element.classList.add("inline");
+
this._frameNodes = new Map;
this._nodesSinceLastNavigation = [];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
