Part of fix for bug # 36037: drag&drop change.
git-svn-id: svn://10.0.0.236/trunk@68747 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -127,7 +127,7 @@ function BeginDragResultTree(event)
|
||||
}
|
||||
|
||||
var nsIDragService = Components.interfaces.nsIDragService;
|
||||
dragService.invokeDragSession ( transArray, null, nsIDragService.DRAGDROP_ACTION_COPY +
|
||||
dragService.invokeDragSession ( event.target, transArray, null, nsIDragService.DRAGDROP_ACTION_COPY +
|
||||
nsIDragService.DRAGDROP_ACTION_MOVE );
|
||||
dragStarted = true;
|
||||
|
||||
|
||||
@@ -133,7 +133,7 @@ function BeginDragThreadTree(event)
|
||||
}
|
||||
|
||||
var nsIDragService = Components.interfaces.nsIDragService;
|
||||
dragService.invokeDragSession ( transArray, null, nsIDragService.DRAGDROP_ACTION_COPY +
|
||||
dragService.invokeDragSession ( event.target, transArray, null, nsIDragService.DRAGDROP_ACTION_COPY +
|
||||
nsIDragService.DRAGDROP_ACTION_MOVE );
|
||||
dragStarted = true;
|
||||
|
||||
|
||||
@@ -196,7 +196,7 @@ function BeginDrag( event)
|
||||
var nsIDragService = Components.interfaces.nsIDragService;
|
||||
top.dragStart = true;
|
||||
|
||||
dragService.invokeDragSession ( transArray, null, nsIDragService.DRAGDROP_ACTION_MOVE);
|
||||
dragService.invokeDragSession ( event.target, transArray, null, nsIDragService.DRAGDROP_ACTION_MOVE);
|
||||
|
||||
|
||||
return( false); // don't propagate the event if a drag has begun
|
||||
|
||||
@@ -82,7 +82,8 @@ nsDragService::~nsDragService()
|
||||
}
|
||||
|
||||
// nsIDragService
|
||||
NS_IMETHODIMP nsDragService::InvokeDragSession (nsISupportsArray * anArrayTransferables,
|
||||
NS_IMETHODIMP nsDragService::InvokeDragSession (nsIDOMNode *aDOMNode,
|
||||
nsISupportsArray * anArrayTransferables,
|
||||
nsIScriptableRegion * aRegion,
|
||||
PRUint32 aActionType)
|
||||
{
|
||||
|
||||
@@ -42,7 +42,8 @@ public:
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
// nsIDragService
|
||||
NS_IMETHOD InvokeDragSession (nsISupportsArray * anArrayTransferables,
|
||||
NS_IMETHOD InvokeDragSession (nsIDOMNode *aDOMNode,
|
||||
nsISupportsArray * anArrayTransferables,
|
||||
nsIScriptableRegion * aRegion,
|
||||
PRUint32 aActionType);
|
||||
NS_IMETHOD StartDragSession();
|
||||
|
||||
@@ -106,7 +106,8 @@ nsDragService::~nsDragService()
|
||||
WinDestroyWindow( mDragWnd);
|
||||
}
|
||||
|
||||
nsresult nsDragService::InvokeDragSession( nsISupportsArray *aTransArray,
|
||||
nsresult nsDragService::InvokeDragSession( nsIDOMNode *aDOMNode,
|
||||
nsISupportsArray *aTransArray,
|
||||
nsIRegion *aRegion,
|
||||
PRUint32 aActionType)
|
||||
{
|
||||
|
||||
@@ -42,7 +42,8 @@ class nsDragService : public nsBaseDragService
|
||||
virtual ~nsDragService();
|
||||
|
||||
// nsIDragService
|
||||
NS_IMETHOD InvokeDragSession( nsISupportsArray *anArrayTransferables,
|
||||
NS_IMETHOD InvokeDragSession( nsIDOMNode *aDOMNode,
|
||||
nsISupportsArray *anArrayTransferables,
|
||||
nsIRegion *aRegion, PRUint32 aActionType);
|
||||
|
||||
// nsIDragSession
|
||||
|
||||
@@ -97,7 +97,8 @@ NS_IMETHODIMP nsDragService::EndDragSession()
|
||||
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
NS_IMETHODIMP nsDragService::InvokeDragSession (nsISupportsArray *aTransferableArray,
|
||||
NS_IMETHODIMP nsDragService::InvokeDragSession (nsIDOMNode *aDOMNode,
|
||||
nsISupportsArray *aTransferableArray,
|
||||
nsIScriptableRegion *aRegion,
|
||||
PRUint32 aActionType)
|
||||
{
|
||||
|
||||
@@ -41,7 +41,7 @@ public:
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
// nsIDragService
|
||||
NS_IMETHOD InvokeDragSession (nsISupportsArray * anArrayTransferables,
|
||||
NS_IMETHOD InvokeDragSession (nsIDOMNode *aDOMNode, nsISupportsArray * anArrayTransferables,
|
||||
nsIScriptableRegion * aRegion, PRUint32 aActionType);
|
||||
NS_IMETHOD GetCurrentSession (nsIDragSession ** aSession);
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ nsDragService::~nsDragService()
|
||||
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
NS_IMETHODIMP nsDragService::InvokeDragSession (nsISupportsArray * anArrayTransferables, nsIScriptableRegion * aRegion, PRUint32 aActionType)
|
||||
NS_IMETHODIMP nsDragService::InvokeDragSession (nsIDOMNode *aDOMNode, nsISupportsArray * anArrayTransferables, nsIScriptableRegion * aRegion, PRUint32 aActionType)
|
||||
{
|
||||
nsresult rv;
|
||||
PRUint32 cnt;
|
||||
|
||||
@@ -41,7 +41,7 @@ public:
|
||||
virtual ~nsDragService();
|
||||
|
||||
// nsIDragService
|
||||
NS_IMETHOD InvokeDragSession (nsISupportsArray * anArrayTransferables, nsIScriptableRegion * aRegion, PRUint32 aActionType);
|
||||
NS_IMETHOD InvokeDragSession (nsIDOMNode *aDOMNode, nsISupportsArray * anArrayTransferables, nsIScriptableRegion * aRegion, PRUint32 aActionType);
|
||||
NS_IMETHOD GetCurrentSession (nsIDragSession ** aSession);
|
||||
|
||||
// nsIDragSession
|
||||
|
||||
Reference in New Issue
Block a user