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

Unified Diff: Source/core/inspector/InspectorOverlayPage.html

Issue 1311783003: Devtools[LayoutEditor]: Rework layout-editor workflow (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@resize
Patch Set: Created 5 years, 4 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
Index: Source/core/inspector/InspectorOverlayPage.html
diff --git a/Source/core/inspector/InspectorOverlayPage.html b/Source/core/inspector/InspectorOverlayPage.html
index f822541446d5883f9fd892bbd140b34c69d00c01..380256cbd11f6c36b096cbee3343422fa3c8af64 100644
--- a/Source/core/inspector/InspectorOverlayPage.html
+++ b/Source/core/inspector/InspectorOverlayPage.html
@@ -447,7 +447,12 @@ function reset(resetData)
editor.style.visibility = "hidden";
editor.textContent = "";
document.body.classList.remove("dimmed");
- document.removeEventListener("mousemove", onGlobalMouseMove);
+ document.removeEventListener("mousedown", consumeEvent);
+ document.removeEventListener("mousemove", onLayoutEditorMouseMove);
+ document.removeEventListener("mouseup", consumeEvent);
+ document.removeEventListener("click", onLayoutEditorClick);
+ document.removeEventListener("keydown", onLayoutEditorKeyDown);
+
delete window.hoverableAreas;
delete window.anchorsByType;
window._gridPainted = false;
@@ -810,7 +815,11 @@ function showLayoutEditor(info)
if (selectedAnchorInfo)
showLabels(selectedAnchorInfo.type, selectedAnchorInfo.propertyName);
- document.addEventListener("mousemove", onGlobalMouseMove);
+ document.addEventListener("mousedown", consumeEvent);
+ document.addEventListener("mousemove", onLayoutEditorMouseMove);
+ document.addEventListener("mouseup", consumeEvent);
+ document.addEventListener("click", onLayoutEditorClick);
+ document.addEventListener("keydown", onLayoutEditorKeyDown);
}
function createAnchor(anchorInfo)
@@ -1023,15 +1032,15 @@ function anchorColorForProperty(anchorInfo)
return "rgb(107, 213, 0)";
}
-function onGlobalMouseMove(event)
+function onLayoutEditorMouseMove(event)
{
+ event.preventDefault();
if (!window.hoverableAreas)
return;
var types = ["padding", "margin"];
for (var type of types) {
var path = hoverableAreas.get(type);
if (path && context.isPointInPath(path, deviceScaleFactor * event.x, deviceScaleFactor * event.y)) {
- event.preventDefault();
showLabels(type);
return;
}
@@ -1039,6 +1048,25 @@ function onGlobalMouseMove(event)
resetLabelCanvas();
}
+function onLayoutEditorClick(event)
+{
+ event.preventDefault();
+ InspectorOverlayHost.clearSelection(true);
+}
+
+function onLayoutEditorKeyDown(event)
+{
+ if (event.keyIdentifier === "U+001B") {
pfeldman 2015/08/24 23:18:13 Add comment with the key name.
sergeyv 2015/08/25 17:58:02 Done.
+ event.preventDefault();
+ InspectorOverlayHost.clearSelection(false);
+ }
+}
+
+function consumeEvent(event)
+{
+ event.preventDefault();
+}
+
function resetLabelCanvas()
{
delete window.labelCanvasState;

Powered by Google App Engine
This is Rietveld 408576698