[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

timothy at apple.com timothy at apple.com
Thu Oct 29 20:51:29 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit 07fc5c8807ae454390ed01e6d4434ca43c05a6a5
Author: timothy at apple.com <timothy at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 24 23:08:21 2009 +0000

    Fix selecting Resources in the Web Inspector's Resources panel.
    
    https://bugs.webkit.org/show_bug.cgi?id=30743
    
    Reviewed by Pavel Feldman.
    
    * inspector/front-end/ResourcesPanel.js:
    (WebInspector.ResourcesPanel.prototype.isCategoryVisible): Added.
    (WebInspector.ResourceSidebarTreeElement.prototype.get selectable): Call
    isCategoryVisible on the ResourcesPanel.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50035 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 495f914..31f93ec 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,18 @@
 2009-10-24  Timothy Hatcher  <timothy at apple.com>
 
+        Fix selecting Resources in the Web Inspector's Resources panel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30743
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.isCategoryVisible): Added.
+        (WebInspector.ResourceSidebarTreeElement.prototype.get selectable): Call
+        isCategoryVisible on the ResourcesPanel.
+
+2009-10-24  Timothy Hatcher  <timothy at apple.com>
+
         Fix the Scope Bar in the Web Inspector's Resource panel, so that selecting
         All will deselect the other filters.
 
diff --git a/WebCore/inspector/front-end/ResourcesPanel.js b/WebCore/inspector/front-end/ResourcesPanel.js
index 4a559d7..cf12f0b 100644
--- a/WebCore/inspector/front-end/ResourcesPanel.js
+++ b/WebCore/inspector/front-end/ResourcesPanel.js
@@ -229,7 +229,12 @@ WebInspector.ResourcesPanel.prototype = {
         }
     },
 
-    _updateFilter: function (e)
+    isCategoryVisible: function(categoryName)
+    {
+        return (this.resourcesGraphsElement.hasStyleClass("filter-all") || this.resourcesGraphsElement.hasStyleClass("filter-" + categoryName.toLowerCase()));
+    },
+
+    _updateFilter: function(e)
     {
         this.filter(e.target);
     },
@@ -1332,7 +1337,7 @@ WebInspector.ResourceSidebarTreeElement.prototype = {
 
     get selectable()
     {
-        return WebInspector.panels.resources._filterCategory == "all" || WebInspector.panels.resources._filterCategory == this.resource.category.name;
+        return WebInspector.panels.resources.isCategoryVisible(this.resource.category.name);
     },
 
     createIconElement: function()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list