mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 670222 - Accidental text selection and more [r=wjohnston]

This commit is contained in:
Mark Finkle 2011-08-01 17:36:42 -04:00
Родитель d9feaaf1ec
Коммит c76e02d881
2 изменённых файлов: 68 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

36
mobile/chrome/content/common-ui.js
Просмотреть файл

@ -1274,10 +1274,7 @@ var SelectionHelper = {
dragMove: function dragMove(dx, dy, scroller) { return false; }
};
this._start.addEventListener("TapDown", this, true);
this._start.addEventListener("TapUp", this, true);
this._end.addEventListener("TapDown", this, true);
this._end.addEventListener("TapUp", this, true);
messageManager.addMessageListener("Browser:SelectionRange", this);
@ -1285,9 +1282,8 @@ var SelectionHelper = {
this.popupState.target.messageManager.sendAsyncMessage("Browser:SelectionStart", { x: this.popupState.x, y: this.popupState.y });
BrowserUI.pushPopup(this, [this._start, this._end]);
// Hide the selection handles
window.addEventListener("TapDown", this, true);
window.addEventListener("resize", this, true);
window.addEventListener("keypress", this, true);
Elements.browsers.addEventListener("URLChanged", this, true);
@ -1301,12 +1297,18 @@ var SelectionHelper = {
return true;
},
hide: function sh_hide() {
hide: function sh_hide(aEvent) {
if (this._start.hidden)
return;
let pos = this.popupState.target.transformClientToBrowser(aEvent.clientX || 0, aEvent.clientY || 0);
let json = {
x: pos.x,
y: pos.y
};
try {
this.popupState.target.messageManager.sendAsyncMessage("Browser:SelectionEnd", {});
this.popupState.target.messageManager.sendAsyncMessage("Browser:SelectionEnd", json);
} catch (e) {
Cu.reportError(e);
}
@ -1316,30 +1318,30 @@ var SelectionHelper = {
this._start.hidden = true;
this._end.hidden = true;
this._start.removeEventListener("TapDown", this, true);
this._start.removeEventListener("TapUp", this, true);
this._end.removeEventListener("TapDown", this, true);
this._end.removeEventListener("TapUp", this, true);
messageManager.removeMessageListener("Browser:SelectionRange", this);
window.removeEventListener("TapDown", this, true);
window.removeEventListener("resize", this, true);
window.removeEventListener("keypress", this, true);
Elements.browsers.removeEventListener("URLChanged", this, true);
Elements.browsers.removeEventListener("SizeChanged", this, true);
Elements.browsers.removeEventListener("ZoomChanged", this, true);
BrowserUI.popPopup(this);
},
handleEvent: function handleEvent(aEvent) {
switch (aEvent.type) {
case "TapDown":
this.target = aEvent.target;
this.deltaX = (aEvent.clientX - this.target.left);
this.deltaY = (aEvent.clientY - this.target.top);
window.addEventListener("TapMove", this, true);
if (aEvent.target == this._start || aEvent.target == this._end) {
this.target = aEvent.target;
this.deltaX = (aEvent.clientX - this.target.left);
this.deltaY = (aEvent.clientY - this.target.top);
window.addEventListener("TapMove", this, true);
} else {
this.hide(aEvent);
}
break;
case "TapUp":
window.removeEventListener("TapMove", this, true);
@ -1367,7 +1369,7 @@ var SelectionHelper = {
case "URLChanged":
case "SizeChanged":
case "ZoomChanged":
this.hide();
this.hide(aEvent);
break;
}
},

66
mobile/chrome/content/content.js
Просмотреть файл

@ -1334,13 +1334,13 @@ var SelectionHandler = {
selectedText: "",
contentWindow: null,
init: function() {
init: function sh_init() {
addMessageListener("Browser:SelectionStart", this);
addMessageListener("Browser:SelectionEnd", this);
addMessageListener("Browser:SelectionMove", this);
},
receiveMessage: function(aMessage) {
receiveMessage: function sh_receiveMessage(aMessage) {
let scrollOffset = ContentScroll.getScrollOffset(content);
let utils = Util.getWindowUtils(content);
let json = aMessage.json;
@ -1352,17 +1352,16 @@ var SelectionHandler = {
// if this is an iframe, dig down to find the document that was clicked
let x = json.x;
let y = json.y;
let offsetX = 0;
let offsetY = 0;
let offset = scrollOffset;
let elem = utils.elementFromPoint(x, y, true, false);
while (elem && (elem instanceof HTMLIFrameElement || elem instanceof HTMLFrameElement)) {
// adjust client coordinates' origin to be top left of iframe viewport
let rect = elem.getBoundingClientRect();
scrollOffset = ContentScroll.getScrollOffset(elem.ownerDocument.defaultView);
offsetX += rect.left;
offset.x += rect.left;
x -= rect.left;
offsetY += rect.top + scrollOffset.y;
offset.y += rect.top + scrollOffset.y;
y -= rect.top + scrollOffset.y;
utils = elem.contentDocument.defaultView.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
elem = utils.elementFromPoint(x, y, true, false);
@ -1402,23 +1401,25 @@ var SelectionHandler = {
return;
}
this.cache = { start: {}, end: {} };
let rects = range.getClientRects();
for (let i=0; i<rects.length; i++) {
if (i == 0) {
this.cache.start.x = rects[i].left + offsetX;
this.cache.start.y = rects[i].bottom + offsetY;
}
this.cache.end.x = rects[i].right + offsetX;
this.cache.end.y = rects[i].bottom + offsetY;
this.cache = this._extractFromRange(range, offset);
let tap = { x: json.x - this.cache.offset.x, y: json.y - this.cache.offset.y };
pointInSelection = (tap.x > this.cache.rect.left && tap.x < this.cache.rect.right) && (tap.y > this.cache.rect.top && tap.y < this.cache.rect.bottom);
if (!pointInSelection) {
selection.collapseToStart();
return;
}
this.contentWindow = contentWindow;
sendAsyncMessage("Browser:SelectionRange", this.cache);
break;
}
case "Browser:SelectionEnd": {
let tap = { x: json.x - this.cache.offset.x, y: json.y - this.cache.offset.y };
pointInSelection = (tap.x > this.cache.rect.left && tap.x < this.cache.rect.right) && (tap.y > this.cache.rect.top && tap.y < this.cache.rect.bottom);
try {
// The selection might already be gone
if (this.contentWindow)
@ -1426,7 +1427,7 @@ var SelectionHandler = {
this.contentWindow = null;
} catch(e) {}
if (this.selectedText.length) {
if (pointInSelection && this.selectedText.length) {
let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper);
clipboard.copyString(this.selectedText);
sendAsyncMessage("Browser:SelectionCopied", { succeeded: true });
@ -1439,11 +1440,16 @@ var SelectionHandler = {
case "Browser:SelectionMove":
if (!this.contentWindow)
return;
// Hack to avoid setting focus in a textbox [Bugs 654352 & 667243]
let elemUnder = elementFromPoint(json.x - scrollOffset.x, json.y - scrollOffset.y);
if (elemUnder && elemUnder instanceof Ci.nsIDOMHTMLInputElement || elemUnder instanceof Ci.nsIDOMHTMLTextAreaElement)
return;
// Limit the selection to the initial content window (don't leave or enter iframes)
if (elemUnder && elemUnder.ownerDocument.defaultView != this.contentWindow)
return;
if (json.type == "end") {
this.cache.end.x = json.x - scrollOffset.x;
this.cache.end.y = json.y - scrollOffset.y;
@ -1460,9 +1466,35 @@ var SelectionHandler = {
}
// Cache the selected text since the selection might be gone by the time we get the "end" message
this.selectedText = this.contentWindow.getSelection().toString().trim();
let selection = this.contentWindow.getSelection()
this.selectedText = selection.toString().trim();
// Update the rect we use to test when finishing the clipboard operation
let range = selection.getRangeAt(0).QueryInterface(Ci.nsIDOMNSRange);
this.cache.rect = this._extractFromRange(range, this.cache.offset).rect;
break;
}
},
_extractFromRange: function sh_extractFromRange(aRange, aOffset) {
let cache = { start: {}, end: {}, rect: { left: Number.MAX_VALUE, top: Number.MAX_VALUE, right: 0, bottom: 0 } };
let rects = aRange.getClientRects();
for (let i=0; i<rects.length; i++) {
if (i == 0) {
cache.start.x = rects[i].left + aOffset.x;
cache.start.y = rects[i].bottom + aOffset.y;
}
cache.end.x = rects[i].right + aOffset.x;
cache.end.y = rects[i].bottom + aOffset.y;
}
cache.rect = aRange.getBoundingClientRect();
cache.rect.left += aOffset.x;
cache.rect.top += aOffset.y;
cache.rect.right += aOffset.x;
cache.rect.bottom += aOffset.y;
cache.offset = aOffset;
return cache;
}
};