Title: [172768] branches/safari-600.1-branch/Source/WebInspectorUI
- Revision
- 172768
- Author
- [email protected]
- Date
- 2014-08-19 15:43:40 -0700 (Tue, 19 Aug 2014)
Log Message
Merge r172615. <rdar://problem/18024530>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172767 => 172768)
--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 22:25:28 UTC (rev 172767)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 22:43:40 UTC (rev 172768)
@@ -1,5 +1,20 @@
2014-08-19 Dana Burkart <[email protected]>
+ Merge r172615. <rdar://problem/18024530>
+
+ 2014-08-14 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Split console toggle button wrong - Images/Images/SplitToggleUp.svg does not exist
+ https://bugs.webkit.org/show_bug.cgi?id=135957
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView):
+ Wrong image path passed to platformImagePath.
+
+2014-08-19 Dana Burkart <[email protected]>
+
Merge r172606
2014-08-14 Joseph Pecoraro <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (172767 => 172768)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2014-08-19 22:25:28 UTC (rev 172767)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2014-08-19 22:43:40 UTC (rev 172768)
@@ -76,7 +76,7 @@
var toolTip = WebInspector.UIString("Show split console");
var altToolTip = WebInspector.UIString("Show full-height console");
- this._toggleSplitNavigationItem = new WebInspector.ToggleButtonNavigationItem("split-toggle", toolTip, altToolTip, platformImagePath("SplitToggleDown.svg"), platformImagePath("Images/SplitToggleUp.svg"), 16, 16);
+ this._toggleSplitNavigationItem = new WebInspector.ToggleButtonNavigationItem("split-toggle", toolTip, altToolTip, platformImagePath("SplitToggleDown.svg"), platformImagePath("SplitToggleUp.svg"), 16, 16);
this._toggleSplitNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleSplit, this);
this._toggleSplitNavigationItem.toggled = WebInspector.isShowingSplitConsole();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes