[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

pfeldman at chromium.org pfeldman at chromium.org
Wed Dec 22 11:23:34 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 47ac01bceda80bd67005a17554e14bc3b970a48c
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 21 17:26:19 2010 +0000

    2010-07-21  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: consider jQuery object to be of array nature.
    
            https://bugs.webkit.org/show_bug.cgi?id=42758
    
            * inspector/front-end/InjectedScript.js:
            (injectedScriptConstructor):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63837 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 70019d0..a4e2674 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-21  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: consider jQuery object to be of array nature.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42758
+
+        * inspector/front-end/InjectedScript.js:
+        (injectedScriptConstructor):
+
 2010-07-21  Alexey Proskuryakov  <ap at apple.com>
 
         Unreviewed Windows build fix.
diff --git a/WebCore/inspector/front-end/InjectedScript.js b/WebCore/inspector/front-end/InjectedScript.js
index 5d9d065..9e16dad 100644
--- a/WebCore/inspector/front-end/InjectedScript.js
+++ b/WebCore/inspector/front-end/InjectedScript.js
@@ -544,6 +544,8 @@ InjectedScript._type = function(obj)
         return "array";
     if (obj instanceof inspectedWindow.HTMLCollection)
         return "array";
+    if (inspectedWindow.jQuery && obj instanceof inspectedWindow.jQuery)
+        return "array";
     if (obj instanceof inspectedWindow.Error)
         return "error";
     return type;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list