Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 420341: Don't Close Target On Drop; p=Serge Gautherie <sgautherie.bz@free.fr>, r=ajschult, sr=neil

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@250484 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mnyromyr%tprac.de 2008-04-18 23:46:11 +00:00
parent 99ea72121c
commit 826d6e4e35
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mozilla/suite/common/bookmarks/bookmarksMenu.js
View File

@ -401,7 +401,13 @@ var BookmarksMenuDNDObserver = {
target = target.parentNode;
if (aDragSession.canDrop) {
this.onDragSetFeedBack(target, orientation);
this.onDragEnterSetTimer(target, aDragSession);
clearTimeout(this.loadTimer);
if (target != aDragSession.sourceNode) {
var This = this;
var targetToBeLoaded = target;
this.loadTimer = setTimeout(function() { This.onDragLoadTarget(targetToBeLoaded); }, This.springLoadedMenuDelay);
}
}
this.mCurrentDragOverTarget = target;
this.mCurrentDropPosition = orientation;
@ -413,7 +419,17 @@ var BookmarksMenuDNDObserver = {
if (target.localName == "menupopup" || target.id == "bookmarks-ptf")
target = target.parentNode;
this.onDragRemoveFeedBack(target);
this.onDragExitSetTimer(target, aDragSession);
clearTimeout(this.closeTimer);
if (this.mDidDrop) {
// Don't close target after dropping into it.
this.mDidDrop = false;
} else {
// Close target while dragging.
var This = this;
this.closeTimer = setTimeout(function() { This.onDragCloseTarget(); }, This.springLoadedMenuDelay);
}
this.mCurrentDragOverTarget = null;
this.mCurrentDropPosition = null;
},
@ -470,6 +486,8 @@ var BookmarksMenuDNDObserver = {
var element = document.createElementNS(XUL_NS, "menuseparator");
menuTarget.insertBefore(element, menuTarget.lastChild);
}
this.mDidDrop = true;
},
canDrop: function (aEvent, aDragSession)
@ -520,6 +538,7 @@ var BookmarksMenuDNDObserver = {
mCurrentDropPosition: null,
loadTimer : null,
closeTimer : null,
mDidDrop : false,
_observers : null,
get mObservers ()
@ -588,26 +607,6 @@ var BookmarksMenuDNDObserver = {
aTarget.lastChild.showPopup(aTarget);
},
onDragEnterSetTimer: function (aTarget, aDragSession)
{
clearTimeout(this.loadTimer);
if (aTarget == aDragSession.sourceNode)
return;
var This = this;
var targetToBeLoaded = aTarget;
this.loadTimer = setTimeout(function() { This.onDragLoadTarget(targetToBeLoaded); }, This.springLoadedMenuDelay);
},
onDragExitSetTimer: function (aTarget, aDragSession)
{
clearTimeout(this.closeTimer);
var This = this;
this.closeTimer = setTimeout(function() { This.onDragCloseTarget(); }, This.springLoadedMenuDelay);
},
onDragSetFeedBack: function (aTarget, aOrientation)
{
switch (aTarget.localName) {
@ -669,11 +668,6 @@ var BookmarksMenuDNDObserver = {
}
},
onDropSetFeedBack: function (aTarget)
{
//XXX Not yet...
},
isContainer: function (aTarget)
{
return aTarget.localName == "menu" ||