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

Bug 853691 - Reorganize SelectionHandler cleanup code paths. r=bnicholson

This commit is contained in:
Margaret Leibovic 2013-03-25 18:25:19 -04:00
Родитель 770209ff6f
Коммит 097b6f1c77
3 изменённых файлов: 68 добавлений и 92 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
mobile/android/base/TextSelection.java
Просмотреть файл

@ -89,16 +89,14 @@ class TextSelection extends Layer implements GeckoEventListener {
layerView.addLayer(TextSelection.this);
}
} else if (event.equals("TextSelection:HideHandles")) {
final JSONArray handles = message.getJSONArray("handles");
LayerView layerView = mActivity.getLayerView();
if (layerView != null) {
layerView.removeLayer(TextSelection.this);
}
for (int i=0; i < handles.length(); i++) {
String handle = handles.getString(i);
getHandle(handle).setVisibility(View.GONE);
}
mStartHandle.setVisibility(View.GONE);
mMiddleHandle.setVisibility(View.GONE);
mEndHandle.setVisibility(View.GONE);
} else if (event.equals("TextSelection:PositionHandles")) {
final boolean rtl = message.getBoolean("rtl");
final JSONArray positions = message.getJSONArray("positions");

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

@ -71,20 +71,22 @@ var SelectionHandler = {
case "Gesture:SingleTap": {
if (this._activeType == this.TYPE_SELECTION) {
let data = JSON.parse(aData);
this.endSelection(data.x, data.y);
if (this._pointInSelection(data.x, data.y))
this.copySelection();
else
this._closeSelection();
}
break;
}
case "Tab:Selected":
if (this._activeType == this.TYPE_CURSOR) {
this.hideThumb();
}
// fall through
this._closeSelection();
break;
case "Window:Resize": {
if (this._activeType == this.TYPE_SELECTION) {
// Knowing when the page is done drawing is hard, so let's just cancel
// the selection when the window changes. We should fix this later.
this.endSelection();
this._closeSelection();
}
break;
}
@ -138,22 +140,15 @@ var SelectionHandler = {
handleEvent: function sh_handleEvent(aEvent) {
switch (aEvent.type) {
case "pagehide":
if (this._activeType == this.TYPE_SELECTION)
this.endSelection();
else
this.hideThumb();
break;
// We only add keydown and blur listeners for TYPE_CURSOR
case "keydown":
case "blur":
if (this._activeType == this.TYPE_CURSOR)
this.hideThumb();
this._closeSelection();
break;
case "compositionend":
// If the handles are displayed during user input, hide them.
if (this._activeType == this.TYPE_CURSOR) {
this.hideThumb();
this._closeSelection();
}
break;
}
@ -174,8 +169,8 @@ var SelectionHandler = {
return;
}
// Otherwise, we do want to end the selection.
this.endSelection();
// Otherwise, we do want to close the selection.
this._closeSelection();
}
this._ignoreCollapsedSelection = false;
@ -193,12 +188,7 @@ var SelectionHandler = {
// aX/aY are in top-level window browser coordinates
startSelection: function sh_startSelection(aElement, aX, aY) {
// Clear out any existing selection
if (this._activeType == this.TYPE_SELECTION) {
this.endSelection();
} else if (this._activeType == this.TYPE_CURSOR) {
// Hide the cursor handles.
this.hideThumb();
}
this._closeSelection();
// Get the element's view
this._view = aElement.ownerDocument.defaultView;
@ -230,14 +220,14 @@ var SelectionHandler = {
selectionController.wordMove(!this._isRTL, true);
} catch(e) {
// If we couldn't select the word at the given point, bail
this._cleanUp();
this._closeSelection();
return;
}
// If there isn't an appropriate selection, bail
if (!selection.rangeCount || !selection.getRangeAt(0) || !selection.toString().trim().length) {
selection.collapseToStart();
this._cleanUp();
this._closeSelection();
return;
}
@ -267,6 +257,13 @@ var SelectionHandler = {
return this._target.getSelection();
},
_getSelectedText: function sh_getSelectedText() {
let selection = this.getSelection();
if (selection)
return selection.toString().trim();
return "";
},
getSelectionController: function sh_getSelectionController() {
if (this._target instanceof Ci.nsIDOMNSEditableElement)
return this._target.QueryInterface(Ci.nsIDOMNSEditableElement).editor.selectionController;
@ -370,57 +367,53 @@ var SelectionHandler = {
this._cwu.sendMouseEventToWindow("mouseup", aX, aY, 0, 0, useShift ? Ci.nsIDOMNSEvent.SHIFT_MASK : 0, true);
},
// aX/aY are in top-level window browser coordinates
endSelection: function sh_endSelection(aX, aY) {
if (this._activeType != this.TYPE_SELECTION)
return "";
this._activeType = this.TYPE_NONE;
sendMessageToJava({
type: "TextSelection:HideHandles",
handles: [this.HANDLE_TYPE_START, this.HANDLE_TYPE_END]
});
let selectedText = "";
let pointInSelection = false;
if (this._view) {
let selection = this.getSelection();
if (selection) {
// Get the text before we clear the selection!
selectedText = selection.toString().trim();
// Also figure out if the point is in the selection before we clear it.
if (arguments.length == 2 && this._pointInSelection(aX, aY))
pointInSelection = true;
selection.removeAllRanges();
selection.QueryInterface(Ci.nsISelectionPrivate).removeSelectionListener(this);
}
copySelection: function sh_copySelection() {
let selectedText = this._getSelectedText();
if (selectedText.length) {
let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper);
clipboard.copyString(selectedText, this._view.document);
NativeWindow.toast.show(Strings.browser.GetStringFromName("selectionHelper.textCopied"), "short");
}
// Only try copying text if there's text to copy!
if (pointInSelection && selectedText.length) {
let element = ElementTouchHelper.anyElementFromPoint(aX, aY);
// Only try copying text if the tap happens in the same view
if (element.ownerDocument.defaultView == this._view) {
let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper);
clipboard.copyString(selectedText, element.ownerDocument);
NativeWindow.toast.show(Strings.browser.GetStringFromName("selectionHelper.textCopied"), "short");
}
}
this._cleanUp();
return selectedText;
this._closeSelection();
},
_cleanUp: function sh_cleanUp() {
shareSelection: function sh_shareSelection() {
let selectedText = this._getSelectedText();
if (selectedText.length) {
sendMessageToJava({
type: "Share:Text",
text: selectedText
});
}
this._closeSelection();
},
/*
* Shuts SelectionHandler down.
*/
_closeSelection: function sh_closeSelection() {
// Bail if there's no active selection
if (this._activeType == this.TYPE_NONE)
return;
if (this._activeType == this.TYPE_SELECTION) {
let selection = this.getSelection();
if (selection) {
// Remove the listener before calling removeAllRanges() to avoid
// recursively notifying the listener.
selection.QueryInterface(Ci.nsISelectionPrivate).removeSelectionListener(this);
selection.removeAllRanges();
}
}
this._activeType = this.TYPE_NONE;
sendMessageToJava({ type: "TextSelection:HideHandles" });
this._removeObservers();
this._view.removeEventListener("pagehide", this, false);
this._view.removeEventListener("keydown", this, false);
this._view.removeEventListener("blur", this, true);
this._activeType = this.TYPE_NONE;
this._view = null;
this._target = null;
this._isRTL = false;
@ -496,16 +489,6 @@ var SelectionHandler = {
});
},
hideThumb: function sh_hideThumb() {
this._activeType = this.TYPE_NONE;
this._cleanUp();
sendMessageToJava({
type: "TextSelection:HideHandles",
handles: [this.HANDLE_TYPE_MIDDLE]
});
},
positionHandles: function sh_positionHandles() {
let scrollX = {}, scrollY = {};
this._view.top.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).getScrollXY(false, scrollX, scrollY);

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

@ -5386,8 +5386,7 @@ var ClipboardHelper = {
copy: function(aElement, aX, aY) {
if (SelectionHandler.shouldShowContextMenu(aX, aY)) {
// Passing coordinates to endSelection takes care of copying for us
SelectionHandler.endSelection(aX, aY);
SelectionHandler.copySelection();
return;
}
@ -5410,11 +5409,7 @@ var ClipboardHelper = {
},
share: function() {
let selectedText = SelectionHandler.endSelection();
sendMessageToJava({
type: "Share:Text",
text: selectedText
});
SelectionHandler.shareSelection();
},
paste: function(aElement) {