[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 13:27:39 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit d74902d12ab4757e0428b89d91f61f29c63ea28c
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 10:41:27 2010 +0000

    2010-09-16  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: console.group(object) does not allow object to be expanded.
            https://bugs.webkit.org/show_bug.cgi?id=45806
    
            * inspector/front-end/ConsoleView.js:
            (WebInspector.ConsoleGroup.prototype.addMessage):
            * inspector/front-end/treeoutline.js:
            (TreeElement.treeElementToggled):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67601 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d8c055d..373588b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-16  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: console.group(object) does not allow object to be expanded.
+        https://bugs.webkit.org/show_bug.cgi?id=45806
+
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleGroup.prototype.addMessage):
+        * inspector/front-end/treeoutline.js:
+        (TreeElement.treeElementToggled):
+
 2010-09-08  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/WebCore/inspector/front-end/ConsoleView.js b/WebCore/inspector/front-end/ConsoleView.js
index 06b5564..72a0172 100644
--- a/WebCore/inspector/front-end/ConsoleView.js
+++ b/WebCore/inspector/front-end/ConsoleView.js
@@ -1094,7 +1094,7 @@ WebInspector.ConsoleGroup.prototype = {
 
         if (msg.type === WebInspector.ConsoleMessage.MessageType.StartGroup || msg.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed) {
             this.messagesElement.parentNode.insertBefore(element, this.messagesElement);
-            element.addEventListener("click", this._titleClicked.bind(this), true);
+            element.addEventListener("click", this._titleClicked.bind(this), false);
             var groupElement = element.enclosingNodeOrSelfWithClass("console-group");
             if (groupElement && msg.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed)
                 groupElement.addStyleClass("collapsed");
diff --git a/WebCore/inspector/front-end/treeoutline.js b/WebCore/inspector/front-end/treeoutline.js
index 5891401..c2a3fe7 100644
--- a/WebCore/inspector/front-end/treeoutline.js
+++ b/WebCore/inspector/front-end/treeoutline.js
@@ -651,6 +651,7 @@ TreeElement.treeElementToggled = function(event)
         else
             element.treeElement.expand();
     }
+    event.stopPropagation();
 }
 
 TreeElement.treeElementDoubleClicked = function(event)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list