<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204642] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204642">204642</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-19 11:41:08 -0700 (Fri, 19 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Console log counter on the dashboard should be better at displaying large numbers
https://bugs.webkit.org/show_bug.cgi?id=160054
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2016-08-19
Reviewed by Matt Baker.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Base/Utilities.js:
(Number.abbreviate):
Add logic for formatting a number as "#K", "#M", and "#B" when it is very large.
* UserInterface/Views/DefaultDashboardView.js:
(WebInspector.DefaultDashboardView.prototype._updateDisplay):
(WebInspector.DefaultDashboardView.prototype._formatPossibleLargeNumber): Deleted.
(WebInspector.DefaultDashboardView.prototype._setConsoleItemValue):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDefaultDashboardViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (204641 => 204642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-08-19 18:30:10 UTC (rev 204641)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-08-19 18:41:08 UTC (rev 204642)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-08-19 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: Console log counter on the dashboard should be better at displaying large numbers
+ https://bugs.webkit.org/show_bug.cgi?id=160054
+
+ Reviewed by Matt Baker.
+
+ * Localizations/en.lproj/localizedStrings.js:
+
+ * UserInterface/Base/Utilities.js:
+ (Number.abbreviate):
+ Add logic for formatting a number as "#K", "#M", and "#B" when it is very large.
+
+ * UserInterface/Views/DefaultDashboardView.js:
+ (WebInspector.DefaultDashboardView.prototype._updateDisplay):
+ (WebInspector.DefaultDashboardView.prototype._formatPossibleLargeNumber): Deleted.
+ (WebInspector.DefaultDashboardView.prototype._setConsoleItemValue):
+
</ins><span class="cx"> 2016-08-17 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Network Tab should not layout if not visible
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (204641 => 204642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-08-19 18:30:10 UTC (rev 204641)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-08-19 18:41:08 UTC (rev 204642)
</span><span class="lines">@@ -7,6 +7,9 @@
</span><span class="cx"> localizedStrings["%.1f KB"] = "%.1f KB";
</span><span class="cx"> localizedStrings["%.1f MB"] = "%.1f MB";
</span><span class="cx"> localizedStrings["%.1f days"] = "%.1f days";
</span><ins>+localizedStrings["%.1fB"] = "%.1fB";
+localizedStrings["%.1fK"] = "%.1fK";
+localizedStrings["%.1fM"] = "%.1fM";
</ins><span class="cx"> localizedStrings["%.1fhrs"] = "%.1fhrs";
</span><span class="cx"> localizedStrings["%.1fmin"] = "%.1fmin";
</span><span class="cx"> localizedStrings["%.1fms"] = "%.1fms";
</span><span class="lines">@@ -44,7 +47,6 @@
</span><span class="cx"> localizedStrings["(uninitialized)"] = "(uninitialized)";
</span><span class="cx"> localizedStrings[", "] = ", ";
</span><span class="cx"> localizedStrings["1 match"] = "1 match";
</span><del>-localizedStrings["999+"] = "999+";
</del><span class="cx"> localizedStrings["Accessibility"] = "Accessibility";
</span><span class="cx"> localizedStrings["Action"] = "Action";
</span><span class="cx"> localizedStrings["Activity Viewer"] = "Activity Viewer";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (204641 => 204642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-08-19 18:30:10 UTC (rev 204641)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-08-19 18:41:08 UTC (rev 204642)
</span><span class="lines">@@ -1036,6 +1036,23 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+Object.defineProperty(Number, "abbreviate",
+{
+ value: function(num)
+ {
+ if (num < 1000)
+ return num;
+
+ if (num < 1000000)
+ return WebInspector.UIString("%.1fK").format(Math.round(num / 100) / 10);
+
+ if (num < 1000000000)
+ return WebInspector.UIString("%.1fM").format(Math.round(num / 100000) / 10);
+
+ return WebInspector.UIString("%.1fB").format(Math.round(num / 100000000) / 10);
+ }
+});
+
</ins><span class="cx"> Object.defineProperty(Uint32Array, "isLittleEndian",
</span><span class="cx"> {
</span><span class="cx"> value: function()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDefaultDashboardViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js (204641 => 204642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js 2016-08-19 18:30:10 UTC (rev 204641)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js 2016-08-19 18:41:08 UTC (rev 204642)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> this._setItemEnabled(timeItem, dashboard.time > 0);
</span><span class="cx">
</span><span class="cx"> var countItem = this._items.resourcesCount;
</span><del>- countItem.text = this._formatPossibleLargeNumber(dashboard.resourcesCount);
</del><ins>+ countItem.text = Number.abbreviate(dashboard.resourcesCount);
</ins><span class="cx"> this._setItemEnabled(countItem, dashboard.resourcesCount > 0);
</span><span class="cx">
</span><span class="cx"> var sizeItem = this._items.resourcesSize;
</span><span class="lines">@@ -95,11 +95,6 @@
</span><span class="cx"> this._setItemEnabled(sizeItem, dashboard.resourcesSize > 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _formatPossibleLargeNumber(number)
- {
- return number > 999 ? WebInspector.UIString("999+") : number;
- }
-
</del><span class="cx"> _appendElementForNamedItem(name)
</span><span class="cx"> {
</span><span class="cx"> var item = this._items[name];
</span><span class="lines">@@ -164,7 +159,7 @@
</span><span class="cx"> this[iVarName] = newValue;
</span><span class="cx">
</span><span class="cx"> var item = this._items[itemName];
</span><del>- item.text = this._formatPossibleLargeNumber(newValue);
</del><ins>+ item.text = Number.abbreviate(newValue);
</ins><span class="cx"> this._setItemEnabled(item, newValue > 0);
</span><span class="cx">
</span><span class="cx"> if (newValue <= previousValue)
</span></span></pre>
</div>
</div>
</body>
</html>