[Pkg-mozext-commits] [firebug] 29/55: Issue 4662 (Incorrect sorting for timeline, if waterfall graph is broken) http://code.google.com/p/fbug/issues/detail?id=4662

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag firebug-1.10.1
in repository firebug.

commit aa164b57b3fce810a147e7aab83df6d28a2e9323
Author: Sebastian Zartner <sebastianzartner at gmx.de>
Date:   Mon Jul 23 08:23:12 2012 +0200

    Issue 4662 (Incorrect sorting for timeline, if waterfall graph is
    broken)
    http://code.google.com/p/fbug/issues/detail?id=4662
---
 extension/content/firebug/net/netProgress.js |  4 ++++
 extension/content/firebug/net/netReps.js     | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/extension/content/firebug/net/netProgress.js b/extension/content/firebug/net/netProgress.js
index b3cdf05..8b1a22e 100644
--- a/extension/content/firebug/net/netProgress.js
+++ b/extension/content/firebug/net/netProgress.js
@@ -118,6 +118,8 @@ NetProgress.prototype =
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+    requestNumber: 1,
+
     startFile: function startFile(request, win)
     {
         var file = this.getRequestFile(request, win);
@@ -816,6 +818,8 @@ NetProgress.prototype =
         }
 
         file.request = request;
+        file.requestNumber = this.requestNumber;
+        this.requestNumber++;
         this.requests.push(request);
         this.files.push(file);
 
diff --git a/extension/content/firebug/net/netReps.js b/extension/content/firebug/net/netReps.js
index 480aa0a..63d47f7 100644
--- a/extension/content/firebug/net/netReps.js
+++ b/extension/content/firebug/net/netReps.js
@@ -181,12 +181,16 @@ Firebug.NetMonitor.NetRequestTable = domplate(Firebug.Rep, new Firebug.Listener(
             (direction == "asc" && header.sorted == -1))
             return;
 
+        var newDirection = ((header.sorted && header.sorted == 1) || (!header.sorted && direction == "asc")) ? "ascending" : "descending";
         if (header)
-            header.setAttribute("aria-sort", header.sorted === -1 ? "descending" : "ascending");
+            header.setAttribute("aria-sort", newDirection);
 
         var tbody = table.lastChild;
         var colID = header.getAttribute("id");
 
+        table.setAttribute("sortcolumn", colID);
+        table.setAttribute("sortdirection", newDirection);
+
         var values = [];
         for (var row = tbody.childNodes[1]; row; row = row.nextSibling)
         {
@@ -221,7 +225,8 @@ Firebug.NetMonitor.NetRequestTable = domplate(Firebug.Rep, new Firebug.Listener(
             switch (colID)
             {
                 case "netTimeCol":
-                    value = row.repObject.startTime;
+                    FBTrace.sysout("row.repObject", row.repObject);
+                    value = row.repObject.requestNumber;
                     break;
                 case "netSizeCol":
                     value = row.repObject.size;
@@ -249,7 +254,7 @@ Firebug.NetMonitor.NetRequestTable = domplate(Firebug.Rep, new Firebug.Listener(
 
         values.sort(sortFunction);
 
-        if ((header.sorted && header.sorted == 1) || (!header.sorted && direction == "asc"))
+        if (newDirection == "ascending")
         {
             Css.removeClass(header, "sortedDescending");
             Css.setClass(header, "sortedAscending");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firebug.git