Title: [190742] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 190742
- Author
- [email protected]
- Date
- 2015-10-08 13:53:07 -0700 (Thu, 08 Oct 2015)
Log Message
Merged r187052. rdar://problem/22801992
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (190741 => 190742)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-10-08 20:24:25 UTC (rev 190741)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-10-08 20:53:07 UTC (rev 190742)
@@ -1,3 +1,22 @@
+2015-10-08 Lucas Forschler <[email protected]>
+
+ Merge r187052. rdar://problem/22801992
+
+ 2015-07-20 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: console.assert(false, "Message") message is not visible in console
+ https://bugs.webkit.org/show_bug.cgi?id=147130
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView.prototype._appendMessageTextAndArguments):
+ We were forgetting to assign the result of args.concat back into args.
+ In re-addressing this, improve the formatting of output if there is
+ a string message or not as the second argument to console.assert(), as
+ that is the common usage.
+
2015-10-02 Matthew Hanson <[email protected]>
Merge r188748. rdar://problem/22802023
Modified: branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (190741 => 190742)
--- branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-10-08 20:24:25 UTC (rev 190741)
+++ branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-10-08 20:53:07 UTC (rev 190742)
@@ -67,7 +67,7 @@
localizedStrings["Application Cache"] = "Application Cache";
localizedStrings["Assertion"] = "Assertion";
localizedStrings["Assertion Failed"] = "Assertion Failed";
-localizedStrings["Assertion failed:"] = "Assertion failed:";
+localizedStrings["Assertion Failed: %s"] = "Assertion Failed: %s";
localizedStrings["Assertion with message: %s"] = "Assertion with message: %s";
localizedStrings["Assertive"] = "Assertive";
localizedStrings["Attribute"] = "Attribute";
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (190741 => 190742)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-10-08 20:24:25 UTC (rev 190741)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-10-08 20:53:07 UTC (rev 190742)
@@ -232,9 +232,13 @@
break;
case WebInspector.ConsoleMessage.MessageType.Assert:
- var args = [WebInspector.UIString("Assertion failed:")];
- if (this._message.parameters)
- args.concat(this._message.parameters);
+ var args = [WebInspector.UIString("Assertion Failed")];
+ if (this._message.parameters) {
+ if (this._message.parameters[0].type === "string")
+ args = [WebInspector.UIString("Assertion Failed: %s")].concat(this._message.parameters);
+ else
+ args = args.concat(this._message.parameters);
+ }
this._appendFormattedArguments(element, args);
break;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
