[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
pfeldman at chromium.org
pfeldman at chromium.org
Wed Jan 20 22:18:50 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit e0e13c5c33bf73e3f94d1c0276fe5775d2df9707
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Jan 10 21:30:58 2010 +0000
2010-01-10 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: Inspect Element selects the wrong element.
Drive-by fix that focuses dom tree upon settting focuesDOMNode.
https://bugs.webkit.org/show_bug.cgi?id=33449
* inspector/front-end/ElementsPanel.js:
(WebInspector.ElementsPanel.prototype.setDocument.selectLastSelectedNode):
(WebInspector.ElementsPanel.prototype.setDocument):
* inspector/front-end/treeoutline.js:
(TreeElement.prototype.select):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53053 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 07faa67..5c9ae7b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,21 @@
Reviewed by Timothy Hatcher.
+ Web Inspector: Inspect Element selects the wrong element.
+ Drive-by fix that focuses dom tree upon settting focuesDOMNode.
+
+ https://bugs.webkit.org/show_bug.cgi?id=33449
+
+ * inspector/front-end/ElementsPanel.js:
+ (WebInspector.ElementsPanel.prototype.setDocument.selectLastSelectedNode):
+ (WebInspector.ElementsPanel.prototype.setDocument):
+ * inspector/front-end/treeoutline.js:
+ (TreeElement.prototype.select):
+
+2010-01-10 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
Web Inspector: Introduce support for flexible line height in the text editor.
https://bugs.webkit.org/show_bug.cgi?id=33431
diff --git a/WebCore/inspector/front-end/ElementsPanel.js b/WebCore/inspector/front-end/ElementsPanel.js
index 90639fe..a8e72ca 100644
--- a/WebCore/inspector/front-end/ElementsPanel.js
+++ b/WebCore/inspector/front-end/ElementsPanel.js
@@ -227,6 +227,10 @@ WebInspector.ElementsPanel.prototype = {
function selectLastSelectedNode(nodeId)
{
+ if (this.focusedDOMNode) {
+ // Focused node has been explicitly set while reaching out for the last selected node.
+ return;
+ }
var node = nodeId ? WebInspector.domAgent.nodeForId(nodeId) : 0;
selectNode.call(this, node);
}
diff --git a/WebCore/inspector/front-end/treeoutline.js b/WebCore/inspector/front-end/treeoutline.js
index f343c7c..b6e35bb 100644
--- a/WebCore/inspector/front-end/treeoutline.js
+++ b/WebCore/inspector/front-end/treeoutline.js
@@ -776,6 +776,7 @@ TreeElement.prototype.select = function(supressOnSelect)
this.treeOutline.selectedTreeElement.deselect();
this.selected = true;
+ this.treeOutline._childrenListNode.focus();
this.treeOutline.selectedTreeElement = this;
if (this._listItemNode)
this._listItemNode.addStyleClass("selected");
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list