Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug 390934 (When document contains contenteditable element, drag-dropping seems possible anywhere in the document). r/sr=jst, a=beltzner.

Browse Source
This commit is contained in:
peterv@propagandism.org 2008-04-18 06:29:57 -07:00
parent 72957354f8
commit c66dd19cd2
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
editor/libeditor/text/nsEditorEventListeners.cpp
View File

@ -557,6 +557,18 @@ nsTextEditorDragListener::DragOver(nsIDOMEvent* aDragEvent)
dragService->GetCurrentSession(getter_AddRefs(dragSession));
if (!dragSession) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMNode> parent;
nsCOMPtr<nsIDOMNSUIEvent> nsuiEvent = do_QueryInterface(aDragEvent);
if (nsuiEvent) {
nsuiEvent->GetRangeParent(getter_AddRefs(parent));
nsCOMPtr<nsIContent> dropParent = do_QueryInterface(parent);
if (!dropParent)
return NS_ERROR_FAILURE;
if (!dropParent->IsEditable())
return NS_OK;
}
PRBool canDrop = CanDrop(aDragEvent);
if (canDrop)
{
@ -574,28 +586,19 @@ nsTextEditorDragListener::DragOver(nsIDOMEvent* aDragEvent)
if (canDrop)
{
if (mCaret)
if (mCaret && nsuiEvent)
{
nsCOMPtr<nsIDOMNSUIEvent> nsuiEvent (do_QueryInterface(aDragEvent));
if (nsuiEvent)
{
nsCOMPtr<nsIDOMNode> parent;
rv = nsuiEvent->GetRangeParent(getter_AddRefs(parent));
if (NS_FAILED(rv)) return rv;
if (!parent) return NS_ERROR_FAILURE;
PRInt32 offset = 0;
rv = nsuiEvent->GetRangeOffset(&offset);
if (NS_FAILED(rv)) return rv;
PRInt32 offset = 0;
rv = nsuiEvent->GetRangeOffset(&offset);
if (NS_FAILED(rv)) return rv;
// to avoid flicker, we could track the node and offset to see if we moved
if (mCaretDrawn)
mCaret->EraseCaret();
//mCaret->SetCaretVisible(PR_TRUE); // make sure it's visible
mCaret->DrawAtPosition(parent, offset);
mCaretDrawn = PR_TRUE;
}
// to avoid flicker, we could track the node and offset to see if we moved
if (mCaretDrawn)
mCaret->EraseCaret();
//mCaret->SetCaretVisible(PR_TRUE); // make sure it's visible
mCaret->DrawAtPosition(parent, offset);
mCaretDrawn = PR_TRUE;
}
}
else
@ -651,6 +654,18 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent)
if (!mEditor)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMNSUIEvent> nsuiEvent = do_QueryInterface(aMouseEvent);
if (nsuiEvent) {
nsCOMPtr<nsIDOMNode> parent;
nsuiEvent->GetRangeParent(getter_AddRefs(parent));
nsCOMPtr<nsIContent> dropParent = do_QueryInterface(parent);
if (!dropParent)
return NS_ERROR_FAILURE;
if (!dropParent->IsEditable())
return NS_OK;
}
PRBool canDrop = CanDrop(aMouseEvent);
if (!canDrop)
{