Changeset 46391 in webkit

Timestamp:

Jul 25, 2009 2:44:06 AM (15 years ago)

Author:

oliver@apple.com

Message:

2009-07-24 Joseph Pecoraro <​joepeck02@gmail.com>

Reviewed by Oliver Hunt.

Inspector: Properties Should be Sorted more Naturally
​https://bugs.webkit.org/show_bug.cgi?id=27329

• inspector/front-end/ObjectPropertiesSection.js: (WebInspector.ObjectPropertiesSection.prototype.update): use the displaySort when showing properties (WebInspector.ObjectPropertiesSection.prototype._displaySort): alphaNumerical sort (WebInspector.ObjectPropertyTreeElement.prototype.onpopulate): use the displaySort when showing properties
• inspector/front-end/utilities.js: (Object.sortedProperties): allow for an optional sorting function in Object.sortedProperties

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ObjectPropertiesSection.js (modified) (4 diffs)
• inspector/front-end/utilities.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-07-24  Joseph Pecoraro  <joepeck02@gmail.com>
+
+        Reviewed by Oliver Hunt.
+
+        Inspector: Properties Should be Sorted more Naturally
+        https://bugs.webkit.org/show_bug.cgi?id=27329
+
+        * inspector/front-end/ObjectPropertiesSection.js:
+        (WebInspector.ObjectPropertiesSection.prototype.update): use the displaySort when showing properties
+        (WebInspector.ObjectPropertiesSection.prototype._displaySort): alphaNumerical sort
+        (WebInspector.ObjectPropertyTreeElement.prototype.onpopulate): use the displaySort when showing properties
+        * inspector/front-end/utilities.js:
+        (Object.sortedProperties): allow for an optional sorting function in Object.sortedProperties
+
 2009-07-24  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/inspector/front-end/ObjectPropertiesSection.js

@@ -1 +1 @@
 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
@@ -59 +60 @@
             for (var prop in this.extraProperties)
                 properties.push(prop);
-        properties.sort();
+        properties.sort(this._displaySort);
 
         this.propertiesTreeOutline.removeChildren();
@@ -80 +81 @@
             this.propertiesTreeOutline.appendChild(infoElement);
         }
+    },
+
+    _displaySort: function(a,b) {
+
+        // if used elsewhere make sure to
+        //  - convert a and b to strings (not needed here, properties are all strings)
+        //  - check if a == b (not needed here, no two properties can be the same)
+
+        var diff = 0;
+        var chunk = /^\d+|^\D+/;
+        var chunka, chunkb, anum, bnum;
+        while (diff === 0) {
+            if (!a && b)
+                return -1;
+            if (!b && a)
+                return 1;
+            chunka = a.match(chunk)[0];
+            chunkb = b.match(chunk)[0];
+            anum = !isNaN(chunka);
+            bnum = !isNaN(chunkb);
+            if (anum && !bnum)
+                return -1;
+            if (bnum && !anum)
+                return 1;
+            if (anum && bnum) {
+                diff = chunka - chunkb;
+                if (diff === 0 && chunka.length !== chunkb.length) {
+                    if (!+chunka && !+chunkb) // chunks are strings of all 0s (special case)
+                        return chunka.length - chunkb.length;
+                    else
+                        return chunkb.length - chunka.length;
+                }
+            } else if (chunka !== chunkb)
+                return (chunka < chunkb) ? -1 : 1;
+            a = a.substring(chunka.length);
+            b = b.substring(chunkb.length);
+        }
+        return diff;
     }
 }
@@ -110 +149 @@
 
         var childObject = this.safePropertyValue(this.parentObject, this.propertyName);
-        var properties = Object.sortedProperties(childObject);
+        var properties = Object.sortedProperties(childObject, WebInspector.ObjectPropertiesSection.prototype._displaySort);
         for (var i = 0; i < properties.length; ++i) {
             var propertyName = properties[i];

trunk/WebCore/inspector/front-end/utilities.js

@@ -95 +95 @@
 }
 
-Object.sortedProperties = function(obj)
+Object.sortedProperties = function(obj, sortFunc)
 {
     var properties = [];
     for (var prop in obj)
         properties.push(prop);
-    properties.sort();
+    properties.sort(sortFunc);
     return properties;
 }