+ fixed potential issue with Aza's recent change to Group.remove
+ Removed erroneous and evidently unnecessary reference to the acceptsDrop class in DragInfo.stop
+ Fixed my last name in install.rdf
--- a/browser/base/content/tabcandy/app/groups.js
+++ b/browser/base/content/tabcandy/app/groups.js
@@ -563,17 +563,17 @@ window.Group.prototype = $.extend(new It
if(typeof(item.setResizable) == 'function')
item.setResizable(true);
if(this._children.length == 0 && !this.locked.close && !this.getTitle()){
// Only remove the group if, after the last child is dropped, it wasn't
// dropped back into the group. We need the setTimeout because otherwise
// at the time of the mouseup the child isn't yet a child of the group.
var self = this;
- a.one('mouseup', function(){
+ $el.one('mouseup', function(){
setTimeout(function(){
if( self._children.length == 0 ) self.close();
}, 50);
});
} else if(!options.dontArrange) {
this.arrange();
}
@@ -1099,17 +1099,17 @@ DragInfo.prototype = {
if(this.parent && !this.parent.locked.close && this.parent != this.item.parent
&& this.parent._children.length == 1 && !this.parent.getTitle()) {
this.parent.remove(this.parent._children[0]);
}*/
if(this.parent && this.parent.expanded)
this.parent.arrange();
- if(this.item && !this.$el.hasClass('acceptsDrop') && !this.item.parent) {
+ if(this.item && !this.item.parent) {
this.item.setZ(drag.zIndex);
drag.zIndex++;
this.item.reloadBounds();
this.item.pushAway();
}
}