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

Bug 346819: fix the drop/canDrop implementations so that search engine list drag and drop behaves correctly in all cases, r=mconnor

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@206500 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gavin%gavinsharp.com 2006-08-03 18:57:59 +00:00
parent d2eb8a19b0
commit 766110e706
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mozilla/browser/components/search/content/engineManager.js
View File

@ -358,25 +358,29 @@ EngineView.prototype = {
canDrop: function(targetIndex, orientation) {
var sourceIndex = this.getSourceIndexFromDrag();
return sourceIndex != -1 &&
sourceIndex != targetIndex &&
(orientation == Ci.nsITreeView.DROP_BEFORE ||
orientation == Ci.nsITreeView.DROP_AFTER);
return (sourceIndex != -1 &&
sourceIndex != targetIndex &&
sourceIndex != (targetIndex + orientation));
},
drop: function(newIndex, orientation) {
drop: function(dropIndex, orientation) {
var sourceIndex = this.getSourceIndexFromDrag();
if (sourceIndex != -1) {
var sourceEngine = this._engineStore.engines[sourceIndex];
var sourceEngine = this._engineStore.engines[sourceIndex];
this._engineStore.moveEngine(sourceEngine, newIndex);
// Redraw, and adjust selection
this.invalidate();
this.selection.clearSelection();
this.selection.select(newIndex);
if (dropIndex > sourceIndex) {
if (orientation == Ci.nsITreeView.DROP_BEFORE)
dropIndex--;
} else {
if (orientation == Ci.nsITreeView.DROP_AFTER)
dropIndex++;
}
this._engineStore.moveEngine(sourceEngine, dropIndex);
// Redraw, and adjust selection
this.invalidate();
this.selection.clearSelection();
this.selection.select(dropIndex);
},
selection: null,