From a0779579a3d16a46d156c80d8f54e1c46a7f577e Mon Sep 17 00:00:00 2001 From: "pfeldman@chromium.org" Date: Tue, 21 Feb 2012 12:00:48 +0000 Subject: [PATCH] Not reviewed: fixing poor merge in r108332. * inspector/front-end/StylesSidebarPane.js: (WebInspector.StylePropertiesSection.prototype._handleSelectorClick): * inspector/front-end/externs.js: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108336 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 8 ++++++++ Source/WebCore/inspector/front-end/StylesSidebarPane.js | 5 ----- Source/WebCore/inspector/front-end/externs.js | 3 +++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 8bfa60b..6e9b829 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,11 @@ +2012-02-21 'Pavel Feldman' + + Not reviewed: fixing poor merge in r108332. + + * inspector/front-end/StylesSidebarPane.js: + (WebInspector.StylePropertiesSection.prototype._handleSelectorClick): + * inspector/front-end/externs.js: + 2012-02-21 Alexander Pavlov Web Inspector: [Styles] Rule source URL tooltip should show line number diff --git a/Source/WebCore/inspector/front-end/StylesSidebarPane.js b/Source/WebCore/inspector/front-end/StylesSidebarPane.js index 63f7ec8..b2acac0 100644 --- a/Source/WebCore/inspector/front-end/StylesSidebarPane.js +++ b/Source/WebCore/inspector/front-end/StylesSidebarPane.js @@ -1219,11 +1219,6 @@ WebInspector.StylePropertiesSection.prototype = { _handleSelectorClick: function(event) { - event.stopPropagation(); - }, - - _handleSelectorClick: function(event) - { this._startEditingOnMouseEvent(); event.stopPropagation(); event.preventDefault(); diff --git a/Source/WebCore/inspector/front-end/externs.js b/Source/WebCore/inspector/front-end/externs.js index a7a4512..04f8b43 100644 --- a/Source/WebCore/inspector/front-end/externs.js +++ b/Source/WebCore/inspector/front-end/externs.js @@ -191,3 +191,6 @@ WebInspector.showPanel = function(panel) WebInspector.inspectedPageDomain; WebInspector.isCompactMode = function() { return false; } + +WebInspector.SourceJavaScriptTokenizer = {} +WebInspector.SourceJavaScriptTokenizer.Keywords = {} -- 2.7.4