Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1239992 - Focus input field if text is not selected in webconsole output;r=linclark

Browse Source 
MozReview-Commit-ID: 2MsIap7Rj4P
This commit is contained in:
Brian Grinstead 2016-03-30 10:10:22 -07:00
parent 8f1d82aeb6
commit bd2c925bdf
2 changed files with 38 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
devtools/client/webconsole/test/browser_console_click_focus.js
View File

@ -30,27 +30,29 @@ add_task(function*() {
let inputNode = hud.jsterm.inputNode;
ok(inputNode.getAttribute("focused"), "input node is focused, first");
let lostFocus = () => {
inputNode.removeEventListener("blur", lostFocus);
info("input node lost focus");
};
inputNode.addEventListener("blur", lostFocus);
document.getElementById("urlbar").click();
ok(!inputNode.getAttribute("focused"), "input node is not focused");
yield waitForBlurredInput(inputNode);
EventUtils.sendMouseEvent({type: "click"}, hud.outputNode);
ok(inputNode.getAttribute("focused"), "input node is focused, second time");
// test click-drags are not focusing the input element.
EventUtils.sendMouseEvent({type: "mousedown", clientX: 3, clientY: 4},
outputItem);
EventUtils.sendMouseEvent({type: "click", clientX: 15, clientY: 5},
outputItem);
yield waitForBlurredInput(inputNode);
todo(!inputNode.getAttribute("focused"), "input node is not focused after drag");
info("Setting a text selection and making sure a click does not re-focus")
let selection = hud.iframeWindow.getSelection();
selection.selectAllChildren(outputItem);
EventUtils.sendMouseEvent({type: "click"}, hud.outputNode);
ok(!inputNode.getAttribute("focused"), "input node is not focused after drag");
});
function waitForBlurredInput(inputNode) {
return new Promise(resolve => {
let lostFocus = () => {
inputNode.removeEventListener("blur", lostFocus);
ok(!inputNode.getAttribute("focused"), "input node is not focused");
resolve();
};
inputNode.addEventListener("blur", lostFocus);
document.getElementById("urlbar").click();
});
}

59
devtools/client/webconsole/webconsole.js
View File

@ -574,15 +574,27 @@ WebConsoleFrame.prototype = {
}
/*
* Focus input line whenever the output area is clicked.
* Reusing _addMEssageLinkCallback since it correctly filters
* drag and select events.
* Focus the input line whenever the output area is clicked.
*/
this._addFocusCallback(this.outputNode, (evt) => {
if ((evt.target.nodeName.toLowerCase() != "a") &&
(evt.target.parentNode.nodeName.toLowerCase() != "a")) {
this.jsterm.focus();
this.outputWrapper.addEventListener("click", (event) => {
// Do not focus on middle/right-click or 2+ clicks.
if (event.detail !== 1 || event.button !== 0) {
return;
}
// Do not focus if something is selected
let selection = this.window.getSelection();
if (selection && !selection.isCollapsed) {
return;
}
// Do not focus if a link was clicked
if (event.target.nodeName.toLowerCase() === "a" ||
event.target.parentNode.nodeName.toLowerCase() === "a") {
return;
}
this.jsterm.focus();
});
// Toggle the timestamp on preference change
@ -2636,39 +2648,6 @@ WebConsoleFrame.prototype = {
}, false);
},
_addFocusCallback: function(node, callback) {
node.addEventListener("mousedown", (event) => {
this._mousedown = true;
this._startX = event.clientX;
this._startY = event.clientY;
}, false);
node.addEventListener("click", (event) => {
let mousedown = this._mousedown;
this._mousedown = false;
// Do not allow middle/right-click or 2+ clicks.
if (event.detail != 1 || event.button != 0) {
return;
}
// If this event started with a mousedown event and it ends at a different
// location, we consider this text selection.
// Add a fuzz modifier of two pixels in any direction to account for
// sloppy clicking.
if (mousedown &&
(Math.abs(event.clientX - this._startX) >= 2) &&
(Math.abs(event.clientY - this._startY) >= 1)) {
this._startX = this._startY = undefined;
return;
}
this._startX = this._startY = undefined;
callback.call(this, event);
}, false);
},
/**
* Handler for the pref-changed event coming from the toolbox.
* Currently this function only handles the timestamps preferences.