Title: [193039] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193039
- Author
- [email protected]
- Date
- 2015-12-03 10:34:16 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r187599. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193038 => 193039)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:34:11 UTC (rev 193038)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:34:16 UTC (rev 193039)
@@ -1,5 +1,19 @@
2015-12-01 Timothy Hatcher <[email protected]>
+ Merge r187599. rdar://problem/23221163
+
+ 2015-07-30 Nikita Vasilyev <[email protected]>
+
+ Web Inspector: Regression: %c is broken for console.group
+ https://bugs.webkit.org/show_bug.cgi?id=147436
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView.prototype._appendMessageTextAndArguments):
+
+2015-12-01 Timothy Hatcher <[email protected]>
+
Merge r187598. rdar://problem/23221163
2015-07-30 Devin Rousso <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (193038 => 193039)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-12-03 18:34:11 UTC (rev 193038)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-12-03 18:34:16 UTC (rev 193039)
@@ -255,8 +255,8 @@
case WebInspector.ConsoleMessage.MessageType.StartGroup:
case WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed:
- var groupName = this._message.messageText || WebInspector.UIString("Group");
- element.appendChild(document.createTextNode(groupName));
+ var args = this._message.parameters || [this._message.messageText || WebInspector.UIString("Group")];
+ this._formatWithSubstitutionString(args, element);
this._extraParameters = null;
break;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
