Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2141)

Unified Diff: Source/devtools/front_end/elements/ElementsTreeOutline.js

Issue 659403006: DevTools: do not consider ? a shortcut while editing. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebaselined Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/devtools/front_end/elements/ElementsPanel.js ('k') | Source/devtools/front_end/main/Main.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/elements/ElementsTreeOutline.js
diff --git a/Source/devtools/front_end/elements/ElementsTreeOutline.js b/Source/devtools/front_end/elements/ElementsTreeOutline.js
index 6dcd47ae64c1fa8583d990e789313922cc259f1d..9722283740ad84e42de6084316218455d226dad5 100644
--- a/Source/devtools/front_end/elements/ElementsTreeOutline.js
+++ b/Source/devtools/front_end/elements/ElementsTreeOutline.js
@@ -49,7 +49,7 @@ WebInspector.ElementsTreeOutline = function(target, omitRootDOMNode, selectEnabl
this._element = outlineDisclosureElement.createChild("ol", "elements-tree-outline");
this._element.addEventListener("mousedown", this._onmousedown.bind(this), false);
this._element.addEventListener("mousemove", this._onmousemove.bind(this), false);
- this._element.addEventListener("mouseout", this._onmouseout.bind(this), false);
+ this._element.addEventListener("mouseleave", this._onmouseleave.bind(this), false);
this._element.addEventListener("dragstart", this._ondragstart.bind(this), false);
this._element.addEventListener("dragover", this._ondragover.bind(this), false);
this._element.addEventListener("dragleave", this._ondragleave.bind(this), false);
@@ -232,8 +232,7 @@ WebInspector.ElementsTreeOutline.prototype = {
return;
// Do not interfere with text editing.
- var currentFocusElement = WebInspector.currentFocusElement();
- if (currentFocusElement && WebInspector.isBeingEdited(currentFocusElement))
+ if (WebInspector.isEditing())
return;
var targetNode = this.selectedDOMNode();
@@ -295,8 +294,7 @@ WebInspector.ElementsTreeOutline.prototype = {
handlePasteKeyboardEvent: function(event)
{
// Do not interfere with text editing.
- var currentFocusElement = WebInspector.currentFocusElement();
- if (currentFocusElement && WebInspector.isBeingEdited(currentFocusElement))
+ if (WebInspector.isEditing())
return;
var targetNode = this.selectedDOMNode();
@@ -613,12 +611,8 @@ WebInspector.ElementsTreeOutline.prototype = {
this._domModel.hideDOMNodeHighlight();
},
- _onmouseout: function(event)
+ _onmouseleave: function(event)
{
- var nodeUnderMouse = event.deepElementFromPoint();
- if (nodeUnderMouse && nodeUnderMouse.isDescendant(this._element))
- return;
-
if (this._previousHoveredElement) {
this._previousHoveredElement.hovered = false;
delete this._previousHoveredElement;
« no previous file with comments | « Source/devtools/front_end/elements/ElementsPanel.js ('k') | Source/devtools/front_end/main/Main.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698