Title: [161233] trunk/Tools
Revision
161233
Author
[email protected]
Date
2014-01-02 15:24:34 -0800 (Thu, 02 Jan 2014)

Log Message

"+" is very confusing at http://build.webkit.org/dashboard
https://bugs.webkit.org/show_bug.cgi?id=126400

Reviewed by Tim Horton.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
(BuildbotQueueView.prototype._appendPendingRevisionCount): Instead of listing open
source and internal counts separately, simply add them. One can always open a popover
for more detail.

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js (161232 => 161233)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js	2014-01-02 23:20:26 UTC (rev 161232)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js	2014-01-02 23:24:34 UTC (rev 161233)
@@ -79,9 +79,9 @@
         if (!latestRecordedOpenSourceRevisionNumber)
             return;
 
-        var openSourceRevisionsBehind = latestRecordedOpenSourceRevisionNumber - latestProductiveIteration.openSourceRevision;
-        if (openSourceRevisionsBehind < 0)
-            openSourceRevisionsBehind = 0;
+        var totalRevisionsBehind = latestRecordedOpenSourceRevisionNumber - latestProductiveIteration.openSourceRevision;
+        if (totalRevisionsBehind < 0)
+            totalRevisionsBehind = 0;
 
         if (latestProductiveIteration.internalRevision) {
             var latestRecordedInternalRevisionNumber = internalTrac.latestRecordedRevisionNumber;
@@ -89,18 +89,15 @@
                 return;
 
             var internalRevisionsBehind = latestRecordedInternalRevisionNumber - latestProductiveIteration.internalRevision;
-            if (internalRevisionsBehind < 0)
-                internalRevisionsBehind = 0;
-            if (openSourceRevisionsBehind || internalRevisionsBehind)
-                var messageText = openSourceRevisionsBehind + " \uff0b " + internalRevisionsBehind + " revisions behind";
-        } else if (openSourceRevisionsBehind)
-            var messageText = openSourceRevisionsBehind + " " + (openSourceRevisionsBehind === 1 ? "revision behind" : "revisions behind");
+            if (internalRevisionsBehind > 0)
+                totalRevisionsBehind += internalRevisionsBehind;
+        }
 
-        if (!messageText)
+        if (!totalRevisionsBehind)
             return;
 
         var messageElement = document.createElement("span"); // We can't just pass text to StatusLineView here, because we need an element that perfectly fits the text for popover positioning.
-        messageElement.textContent = messageText;
+        messageElement.textContent = totalRevisionsBehind + " " + (totalRevisionsBehind === 1 ? "revision behind" : "revisions behind");
         var status = new StatusLineView(messageElement, StatusLineView.Status.NoBubble);
         this.element.appendChild(status.element);
 

Modified: trunk/Tools/ChangeLog (161232 => 161233)


--- trunk/Tools/ChangeLog	2014-01-02 23:20:26 UTC (rev 161232)
+++ trunk/Tools/ChangeLog	2014-01-02 23:24:34 UTC (rev 161233)
@@ -1,5 +1,17 @@
 2014-01-02  Alexey Proskuryakov  <[email protected]>
 
+        "+" is very confusing at http://build.webkit.org/dashboard
+        https://bugs.webkit.org/show_bug.cgi?id=126400
+
+        Reviewed by Tim Horton.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
+        (BuildbotQueueView.prototype._appendPendingRevisionCount): Instead of listing open
+        source and internal counts separately, simply add them. One can always open a popover
+        for more detail.
+
+2014-01-02  Alexey Proskuryakov  <[email protected]>
+
         Accessing Trac from build.webkit.org/dashboard should enable XMLHttpRequest.withCredentials
         https://bugs.webkit.org/show_bug.cgi?id=126391
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to