<!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>[190303] trunk/Tools</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/190303">190303</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-28 21:31:16 -0700 (Mon, 28 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix JS errors on dashboard metrics page
https://bugs.webkit.org/show_bug.cgi?id=149608
Patch by Dean Johnson <dean_johnson@apple.com> on 2015-09-28
Reviewed by Alexey Proskuryakov.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js: Updated to use Settings.
(initPlatformsByFamily):
(updateHiddenPlatforms):
(parsePlatformFamily): Deleted.
(updateToggleButtons): Deleted.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js:
(updateHiddenPlatforms): Added to remove errors.
(initPlatformsByFamily): Added to remove errors.
(unhiddenQueues): Updated to use Settings.
(documentReady): Added logic to add toggle buttons to the settings menu.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Settings.js:
(Settings.prototype.parsePlatformFamily): Moved duplicate logic from Main.js and
MetricsMain.js to Settings.
(Settings.prototype.updateToggleButtons): Moved duplicate logic from Main.js and
MetricsMain.js to Settings.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js:
(QueueView.prototype._updateHiddenState): Updated to use Settings.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsMainjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsMetricsMainjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsQueueViewjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsSettingsjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Settings.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js (190302 => 190303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js 2015-09-29 02:38:00 UTC (rev 190302)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js 2015-09-29 04:31:16 UTC (rev 190303)
</span><span class="lines">@@ -104,13 +104,6 @@
</span><span class="cx"> testNames[Buildbot.TestCategory.WebKit2] = "WK2 Tests";
</span><span class="cx"> testNames[Buildbot.TestCategory.WebKit1] = "WK1 Tests";
</span><span class="cx">
</span><del>-function parsePlatformFamily(platformName)
-{
- if (platformName)
- return platformName.substr(0, platformName.indexOf("-"));
- return ''
-}
-
</del><span class="cx"> function initPlatformsByFamily()
</span><span class="cx"> {
</span><span class="cx"> var platforms = Dashboard.sortedPlatforms;
</span><span class="lines">@@ -119,7 +112,7 @@
</span><span class="cx"> if (!categorizedQueuesByPlatformAndBuildType[platforms[i].name])
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- var platformFamily = parsePlatformFamily(platforms[i].name);
</del><ins>+ var platformFamily = settings.parsePlatformFamily(platforms[i].name);
</ins><span class="cx"> if (platformsByFamily[platformFamily])
</span><span class="cx"> platformsByFamily[platformFamily].push(platforms[i].name)
</span><span class="cx"> else
</span><span class="lines">@@ -127,23 +120,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function updateToggleButtons()
-{
- var hiddenPlatformFamilies = settings.getObject("hiddenPlatformFamilies") || [];
- var hiddenFamilyButtons = {"all": hiddenPlatformFamilies.length > 0};
- for (var i = 0; i < hiddenPlatformFamilies.length; ++i)
- hiddenFamilyButtons[hiddenPlatformFamilies[i]] = true;
-
- var platformFamilyButtons = document.getElementsByClassName("platformFamilyToggleButton");
- for (var i = 0; i < platformFamilyButtons.length; ++i) {
- var hiddenPlatformFamily = parsePlatformFamily(platformFamilyButtons[i].id);
- if (!hiddenFamilyButtons[hiddenPlatformFamily])
- platformFamilyButtons[i].classList.add("familyShown");
- else
- platformFamilyButtons[i].classList.remove("familyShown");
- }
-}
-
</del><span class="cx"> function updateHiddenPlatforms()
</span><span class="cx"> {
</span><span class="cx"> var hiddenPlatformFamilies = settings.getObject("hiddenPlatformFamilies") || [];
</span><span class="lines">@@ -160,7 +136,7 @@
</span><span class="cx"> platformRow.classList.add("hidden");
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- updateToggleButtons();
</del><ins>+ settings.updateToggleButtons();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function applyAccessibilityColorSetting()
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsMetricsMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js (190302 => 190303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js 2015-09-29 02:38:00 UTC (rev 190302)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js 2015-09-29 04:31:16 UTC (rev 190303)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> var allResultsPseudoQueue = { id: "allResultsPseudoQueue" };
</span><span class="cx">
</span><span class="cx"> var categorizedQueuesByPlatformAndBuildType = {};
</span><ins>+var platformsByFamily = {};
</ins><span class="cx">
</span><span class="cx"> for (var i = 0; i < buildbots.length; ++i) {
</span><span class="cx"> var buildbot = buildbots[i];
</span><span class="lines">@@ -70,6 +71,43 @@
</span><span class="cx"> testNames[Buildbot.TestCategory.WebKit2] = "WK2 Tests";
</span><span class="cx"> testNames[Buildbot.TestCategory.WebKit1] = "WK1 Tests";
</span><span class="cx">
</span><ins>+
+function updateHiddenPlatforms()
+{
+ var hiddenPlatformFamilies = settings.getObject("hiddenPlatformFamilies") || [];
+ var platformRows = document.querySelectorAll("tr.platform");
+ for (var i = 0; i < platformRows.length; ++i)
+ platformRows[i].classList.remove("hidden");
+
+ for (var i = 0; i < hiddenPlatformFamilies.length; ++i) {
+ var platformFamily = hiddenPlatformFamilies[i];
+ for (var j = 0; j < platformsByFamily[platformFamily].length; ++j) {
+ var name = platformsByFamily[platformFamily][j];
+ var platformRow = document.querySelector("tr.platform." + name);
+ if (platformRow)
+ platformRow.classList.add("hidden");
+ }
+ }
+ settings.updateToggleButtons();
+}
+
+
+function initPlatformsByFamily()
+{
+ var platforms = Dashboard.sortedPlatforms;
+ for (var i in platforms) {
+ // Make sure the platform will be displayed on the page before considering its platform family.
+ if (!categorizedQueuesByPlatformAndBuildType[platforms[i].name])
+ continue;
+
+ var platformFamily = settings.parsePlatformFamily(platforms[i].name);
+ if (platformsByFamily[platformFamily])
+ platformsByFamily[platformFamily].push(platforms[i].name)
+ else
+ platformsByFamily[platformFamily] = [platforms[i].name]
+ }
+}
+
</ins><span class="cx"> function unhiddenQueues()
</span><span class="cx"> {
</span><span class="cx"> var hiddenPlatformFamilies = settings.getObject("hiddenPlatformFamilies") || [];
</span><span class="lines">@@ -78,7 +116,7 @@
</span><span class="cx"> var buildbot = buildbots[i];
</span><span class="cx"> for (var id in buildbot.queues) {
</span><span class="cx"> var queue = buildbot.queues[id];
</span><del>- if (-1 === hiddenPlatformFamilies.indexOf(parsePlatformFamily(queue.platform)))
</del><ins>+ if (-1 === hiddenPlatformFamilies.indexOf(settings.parsePlatformFamily(queue.platform)))
</ins><span class="cx"> result.push(queue);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -305,6 +343,33 @@
</span><span class="cx"> settingsButton.classList.add("settings");
</span><span class="cx"> document.body.appendChild(settingsButton);
</span><span class="cx">
</span><ins>+ var settingsWrapper = document.createElement("div");
+ settingsWrapper.classList.add("unhide", "hidden", "settingsWrapper")
+
+ var platformFamilyToggleWrapper = document.createElement("div");
+ platformFamilyToggleWrapper.classList.add("unhide", "hidden", "familyToggleWrapper");
+
+ var unhideAllButton = document.createElement("div");
+ unhideAllButton.addEventListener("click", function () { settings.clearHiddenPlatformFamilies(); });
+ unhideAllButton.classList.add("unhide", "hidden", "platformFamilyToggleButton");
+ unhideAllButton.setAttribute("id", "all-platformFamilyToggleButton");
+ unhideAllButton.textContent = "all";
+ platformFamilyToggleWrapper.appendChild(unhideAllButton);
+
+ initPlatformsByFamily();
+ for (var platformFamily in platformsByFamily) {
+ var platformFamilyToggle = document.createElement("div");
+ platformFamilyToggle.addEventListener("click", function () {
+ settings.toggleHiddenPlatformFamily(this.toString());
+ }.bind(platformFamily));
+ platformFamilyToggle.classList.add("unhide", "hidden", "platformFamilyToggleButton");
+ platformFamilyToggle.setAttribute("id", platformFamily + "-platformFamilyToggleButton");
+ platformFamilyToggle.textContent = platformFamily;
+ platformFamilyToggleWrapper.appendChild(platformFamilyToggle);
+ }
+ settingsWrapper.appendChild(platformFamilyToggleWrapper);
+ document.body.appendChild(settingsWrapper);
+
</ins><span class="cx"> updateHiddenPlatforms();
</span><span class="cx"> settings.addSettingListener("hiddenPlatformFamilies", updateHiddenPlatforms);
</span><span class="cx"> settings.addSettingListener("enteredSettings", function() {
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsQueueViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js (190302 => 190303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js 2015-09-29 02:38:00 UTC (rev 190302)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js 2015-09-29 04:31:16 UTC (rev 190303)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> var hiddenPlatformFamilies = settings.getObject("hiddenPlatformFamilies");
</span><span class="cx"> var wasHidden = !this.updateTimer;
</span><del>- var isHidden = hiddenPlatformFamilies && hiddenPlatformFamilies.contains(parsePlatformFamily(this.platform));
</del><ins>+ var isHidden = hiddenPlatformFamilies && hiddenPlatformFamilies.contains(settings.parsePlatformFamily(this.platform));
</ins><span class="cx">
</span><span class="cx"> if (wasHidden && !isHidden) {
</span><span class="cx"> this._updateQueues();
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsSettingsjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Settings.js (190302 => 190303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Settings.js 2015-09-29 02:38:00 UTC (rev 190302)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Settings.js 2015-09-29 04:31:16 UTC (rev 190303)
</span><span class="lines">@@ -84,6 +84,13 @@
</span><span class="cx"> document.body.classList.toggle("settings-visible");
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ parsePlatformFamily: function(platformName)
+ {
+ if (!platformName)
+ return '';
+ return platformName.substr(0, platformName.indexOf("-"));
+ },
+
</ins><span class="cx"> toggleHiddenPlatformFamily: function(platformFamily)
</span><span class="cx"> {
</span><span class="cx"> var hiddenPlatformFamilies = this.getObject("hiddenPlatformFamilies") || [];
</span><span class="lines">@@ -102,4 +109,21 @@
</span><span class="cx"> this.setObject("hiddenPlatformFamilies", []);
</span><span class="cx"> this.fireSettingListener("hiddenPlatformFamilies");
</span><span class="cx"> },
</span><ins>+
+ updateToggleButtons: function()
+ {
+ var hiddenPlatformFamilies = this.getObject("hiddenPlatformFamilies") || [];
+ var hiddenFamilyButtons = {"all": hiddenPlatformFamilies.length > 0};
+ for (var i = 0; i < hiddenPlatformFamilies.length; ++i)
+ hiddenFamilyButtons[hiddenPlatformFamilies[i]] = true;
+
+ var platformFamilyButtons = document.getElementsByClassName("platformFamilyToggleButton");
+ for (var i = 0; i < platformFamilyButtons.length; ++i) {
+ var hiddenPlatformFamily = this.parsePlatformFamily(platformFamilyButtons[i].id);
+ if (!hiddenFamilyButtons[hiddenPlatformFamily])
+ platformFamilyButtons[i].classList.add("familyShown");
+ else
+ platformFamilyButtons[i].classList.remove("familyShown");
+ }
+ },
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190302 => 190303)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-29 02:38:00 UTC (rev 190302)
+++ trunk/Tools/ChangeLog 2015-09-29 04:31:16 UTC (rev 190303)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-09-28 Dean Johnson <dean_johnson@apple.com>
+
+ Fix JS errors on dashboard metrics page
+ https://bugs.webkit.org/show_bug.cgi?id=149608
+
+ Reviewed by Alexey Proskuryakov.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js: Updated to use Settings.
+ (initPlatformsByFamily):
+ (updateHiddenPlatforms):
+ (parsePlatformFamily): Deleted.
+ (updateToggleButtons): Deleted.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js:
+ (updateHiddenPlatforms): Added to remove errors.
+ (initPlatformsByFamily): Added to remove errors.
+ (unhiddenQueues): Updated to use Settings.
+ (documentReady): Added logic to add toggle buttons to the settings menu.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Settings.js:
+ (Settings.prototype.parsePlatformFamily): Moved duplicate logic from Main.js and
+ MetricsMain.js to Settings.
+ (Settings.prototype.updateToggleButtons): Moved duplicate logic from Main.js and
+ MetricsMain.js to Settings.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js:
+ (QueueView.prototype._updateHiddenState): Updated to use Settings.
+
</ins><span class="cx"> 2015-09-28 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> Appscale query fails because of missing index
</span></span></pre>
</div>
</div>
</body>
</html>