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

[apavlov at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit af8ad18283b6de986a5b5ea29720069fbc196479
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 15:17:05 2010 +0000

    2010-07-14  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: Enable toggling of the "Inspect Element" mode from the browser
            https://bugs.webkit.org/show_bug.cgi?id=42169
    
            * inspector/front-end/ElementsPanel.js:
            (WebInspector.ElementsPanel):
            (WebInspector.ElementsPanel.prototype.handleShortcut):
            (WebInspector.ElementsPanel.prototype.toggleSearchingForNode):
            * inspector/front-end/inspector.js:
            (WebInspector.toggleSearchingForNode):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63321 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dce280d..76d65aa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-14  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Enable toggling of the "Inspect Element" mode from the browser
+        https://bugs.webkit.org/show_bug.cgi?id=42169
+
+        * inspector/front-end/ElementsPanel.js:
+        (WebInspector.ElementsPanel):
+        (WebInspector.ElementsPanel.prototype.handleShortcut):
+        (WebInspector.ElementsPanel.prototype.toggleSearchingForNode):
+        * inspector/front-end/inspector.js:
+        (WebInspector.toggleSearchingForNode):
+
 2010-07-14  Eric Carlson  <eric.carlson at apple.com>
 
         Unreviewed, build fix for r63319.
diff --git a/WebCore/inspector/front-end/ElementsPanel.js b/WebCore/inspector/front-end/ElementsPanel.js
index cd7cbd2..e55294a 100644
--- a/WebCore/inspector/front-end/ElementsPanel.js
+++ b/WebCore/inspector/front-end/ElementsPanel.js
@@ -99,7 +99,7 @@ WebInspector.ElementsPanel = function()
     this.sidebarResizeElement.addEventListener("mousedown", this.rightSidebarResizerDragStart.bind(this), false);
 
     this._nodeSearchButton = new WebInspector.StatusBarButton(WebInspector.UIString("Select an element in the page to inspect it."), "node-search-status-bar-item");
-    this._nodeSearchButton.addEventListener("click", this._nodeSearchButtonClicked.bind(this), false);
+    this._nodeSearchButton.addEventListener("click", this.toggleSearchingForNode.bind(this), false);
 
     this.element.appendChild(this.contentElement);
     this.element.appendChild(this.sidebarElement);
@@ -1092,7 +1092,7 @@ WebInspector.ElementsPanel.prototype = {
                 var isNodeSearchKey = event.ctrlKey && !event.metaKey && !event.altKey && event.shiftKey;
 
             if (isNodeSearchKey) {
-                this._nodeSearchButtonClicked(event);
+                this.toggleSearchingForNode();
                 event.handled = true;
                 return;
             }
@@ -1136,7 +1136,7 @@ WebInspector.ElementsPanel.prototype = {
         this.treeOutline.updateSelection();
     },
 
-    _nodeSearchButtonClicked: function(event)
+    toggleSearchingForNode: function()
     {
         if (!this._nodeSearchButton.toggled)
             InspectorBackend.enableSearchingForNode();
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 89d1ae0..7c255bb 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1071,6 +1071,14 @@ WebInspector.elementDragEnd = function(event)
     event.preventDefault();
 }
 
+WebInspector.toggleSearchingForNode = function()
+{
+    if (this.panels.elements) {
+        this.showElementsPanel();
+        this.panels.elements.toggleSearchingForNode();
+    }
+}
+
 WebInspector.showConsole = function()
 {
     this.drawer.showView(this.console);

-- 
WebKit Debian packaging