Ignore traces which have not been inserted yet when calculating

[rails.git] / public / javascripts / dragdrop.js

diff --git a/public/javascripts/dragdrop.js b/public/javascripts/dragdrop.js
index ccf4a1e45caead9e0958b6630e01ede726cd24d5..07229f986f58f3b2101b7a79991d4534051e79e0 100644 (file)
--- a/public/javascripts/dragdrop.js
+++ b/public/javascripts/dragdrop.js
@@ -1,6 +1,6 @@
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
-// 
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2008 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
+//

 // script.aculo.us is freely distributable under the terms of an MIT-style license.
 // For details, see the script.aculo.us web site: http://script.aculo.us/
 
 // script.aculo.us is freely distributable under the terms of an MIT-style license.
 // For details, see the script.aculo.us web site: http://script.aculo.us/
 


@@ -32,7 +32,7 @@ var Droppables = {
         options._containers.push($(containment));
       }
     }
         options._containers.push($(containment));
       }
     }

-    
+

     if(options.accept) options.accept = [options.accept].flatten();
 
     Element.makePositioned(element); // fix IE
     if(options.accept) options.accept = [options.accept].flatten();
 
     Element.makePositioned(element); // fix IE


@@ -40,34 +40,34 @@ var Droppables = {
 
     this.drops.push(options);
   },
 
     this.drops.push(options);
   },

-  
+

   findDeepestChild: function(drops) {
     deepest = drops[0];
   findDeepestChild: function(drops) {
     deepest = drops[0];

-      
+

     for (i = 1; i < drops.length; ++i)
       if (Element.isParent(drops[i].element, deepest.element))
         deepest = drops[i];
     for (i = 1; i < drops.length; ++i)
       if (Element.isParent(drops[i].element, deepest.element))
         deepest = drops[i];

-    
+

     return deepest;
   },
 
   isContained: function(element, drop) {
     var containmentNode;
     if(drop.tree) {
     return deepest;
   },
 
   isContained: function(element, drop) {
     var containmentNode;
     if(drop.tree) {

-      containmentNode = element.treeNode; 
+      containmentNode = element.treeNode;

     } else {
       containmentNode = element.parentNode;
     }
     return drop._containers.detect(function(c) { return containmentNode == c });
   },
     } else {
       containmentNode = element.parentNode;
     }
     return drop._containers.detect(function(c) { return containmentNode == c });
   },

-  
+

   isAffected: function(point, element, drop) {
     return (
       (drop.element!=element) &&
       ((!drop._containers) ||
         this.isContained(element, drop)) &&
       ((!drop.accept) ||
   isAffected: function(point, element, drop) {
     return (
       (drop.element!=element) &&
       ((!drop._containers) ||
         this.isContained(element, drop)) &&
       ((!drop.accept) ||

-        (Element.classNames(element).detect( 
+        (Element.classNames(element).detect(

           function(v) { return drop.accept.include(v) } ) )) &&
       Position.within(drop.element, point[0], point[1]) );
   },
           function(v) { return drop.accept.include(v) } ) )) &&
       Position.within(drop.element, point[0], point[1]) );
   },


@@ -87,12 +87,12 @@ var Droppables = {
   show: function(point, element) {
     if(!this.drops.length) return;
     var drop, affected = [];
   show: function(point, element) {
     if(!this.drops.length) return;
     var drop, affected = [];

-    
+

     this.drops.each( function(drop) {
       if(Droppables.isAffected(point, element, drop))
         affected.push(drop);
     });
     this.drops.each( function(drop) {
       if(Droppables.isAffected(point, element, drop))
         affected.push(drop);
     });

-        
+

     if(affected.length>0)
       drop = Droppables.findDeepestChild(affected);
 
     if(affected.length>0)
       drop = Droppables.findDeepestChild(affected);
 


@@ -101,7 +101,7 @@ var Droppables = {
       Position.within(drop.element, point[0], point[1]);
       if(drop.onHover)
         drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
       Position.within(drop.element, point[0], point[1]);
       if(drop.onHover)
         drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));

-      
+

       if (drop != this.last_active) Droppables.activate(drop);
     }
   },
       if (drop != this.last_active) Droppables.activate(drop);
     }
   },


@@ -112,8 +112,8 @@ var Droppables = {
 
     if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
       if (this.last_active.onDrop) {
 
     if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
       if (this.last_active.onDrop) {

-        this.last_active.onDrop(element, this.last_active.element, event); 
-        return true; 
+        this.last_active.onDrop(element, this.last_active.element, event);
+        return true;

       }
   },
 
       }
   },
 


@@ -121,25 +121,25 @@ var Droppables = {
     if(this.last_active)
       this.deactivate(this.last_active);
   }
     if(this.last_active)
       this.deactivate(this.last_active);
   }

-}
+};

 
 var Draggables = {
   drags: [],
   observers: [],
 
 var Draggables = {
   drags: [],
   observers: [],

-  
+

   register: function(draggable) {
     if(this.drags.length == 0) {
       this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
       this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
       this.eventKeypress  = this.keyPress.bindAsEventListener(this);
   register: function(draggable) {
     if(this.drags.length == 0) {
       this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
       this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
       this.eventKeypress  = this.keyPress.bindAsEventListener(this);

-      
+

       Event.observe(document, "mouseup", this.eventMouseUp);
       Event.observe(document, "mousemove", this.eventMouseMove);
       Event.observe(document, "keypress", this.eventKeypress);
     }
     this.drags.push(draggable);
   },
       Event.observe(document, "mouseup", this.eventMouseUp);
       Event.observe(document, "mousemove", this.eventMouseMove);
       Event.observe(document, "keypress", this.eventKeypress);
     }
     this.drags.push(draggable);
   },

-  
+

   unregister: function(draggable) {
     this.drags = this.drags.reject(function(d) { return d==draggable });
     if(this.drags.length == 0) {
   unregister: function(draggable) {
     this.drags = this.drags.reject(function(d) { return d==draggable });
     if(this.drags.length == 0) {


@@ -148,24 +148,24 @@ var Draggables = {
       Event.stopObserving(document, "keypress", this.eventKeypress);
     }
   },
       Event.stopObserving(document, "keypress", this.eventKeypress);
     }
   },

-  
+

   activate: function(draggable) {
   activate: function(draggable) {

-    if(draggable.options.delay) { 
-      this._timeout = setTimeout(function() { 
-        Draggables._timeout = null; 
-        window.focus(); 
-        Draggables.activeDraggable = draggable; 
-      }.bind(this), draggable.options.delay); 
+    if(draggable.options.delay) {
+      this._timeout = setTimeout(function() {
+        Draggables._timeout = null;
+        window.focus();
+        Draggables.activeDraggable = draggable;
+      }.bind(this), draggable.options.delay);

     } else {
       window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
       this.activeDraggable = draggable;
     }
   },
     } else {
       window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
       this.activeDraggable = draggable;
     }
   },

-  
+

   deactivate: function() {
     this.activeDraggable = null;
   },
   deactivate: function() {
     this.activeDraggable = null;
   },

-  
+

   updateDrag: function(event) {
     if(!this.activeDraggable) return;
     var pointer = [Event.pointerX(event), Event.pointerY(event)];
   updateDrag: function(event) {
     if(!this.activeDraggable) return;
     var pointer = [Event.pointerX(event), Event.pointerY(event)];


@@ -173,36 +173,36 @@ var Draggables = {
     // the same coordinates, prevent needless redrawing (moz bug?)
     if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
     this._lastPointer = pointer;
     // the same coordinates, prevent needless redrawing (moz bug?)
     if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
     this._lastPointer = pointer;

-    
+

     this.activeDraggable.updateDrag(event, pointer);
   },
     this.activeDraggable.updateDrag(event, pointer);
   },

-  
+

   endDrag: function(event) {
   endDrag: function(event) {

-    if(this._timeout) { 
-      clearTimeout(this._timeout); 
-      this._timeout = null; 
+    if(this._timeout) {
+      clearTimeout(this._timeout);
+      this._timeout = null;

     }
     if(!this.activeDraggable) return;
     this._lastPointer = null;
     this.activeDraggable.endDrag(event);
     this.activeDraggable = null;
   },
     }
     if(!this.activeDraggable) return;
     this._lastPointer = null;
     this.activeDraggable.endDrag(event);
     this.activeDraggable = null;
   },

-  
+

   keyPress: function(event) {
     if(this.activeDraggable)
       this.activeDraggable.keyPress(event);
   },
   keyPress: function(event) {
     if(this.activeDraggable)
       this.activeDraggable.keyPress(event);
   },

-  
+

   addObserver: function(observer) {
     this.observers.push(observer);
     this._cacheObserverCallbacks();
   },
   addObserver: function(observer) {
     this.observers.push(observer);
     this._cacheObserverCallbacks();
   },

-  
+

   removeObserver: function(element) {  // element instead of observer fixes mem leaks
     this.observers = this.observers.reject( function(o) { return o.element==element });
     this._cacheObserverCallbacks();
   },
   removeObserver: function(element) {  // element instead of observer fixes mem leaks
     this.observers = this.observers.reject( function(o) { return o.element==element });
     this._cacheObserverCallbacks();
   },

-  
+

   notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
     if(this[eventName+'Count'] > 0)
       this.observers.each( function(o) {
   notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
     if(this[eventName+'Count'] > 0)
       this.observers.each( function(o) {


@@ -210,7 +210,7 @@ var Draggables = {
       });
     if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
   },
       });
     if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
   },

-  
+

   _cacheObserverCallbacks: function() {
     ['onStart','onEnd','onDrag'].each( function(eventName) {
       Draggables[eventName+'Count'] = Draggables.observers.select(
   _cacheObserverCallbacks: function() {
     ['onStart','onEnd','onDrag'].each( function(eventName) {
       Draggables[eventName+'Count'] = Draggables.observers.select(


@@ -218,7 +218,7 @@ var Draggables = {
       ).length;
     });
   }
       ).length;
     });
   }

-}
+};

 
 /*--------------------------------------------------------------------------*/
 
 
 /*--------------------------------------------------------------------------*/
 


@@ -234,12 +234,12 @@ var Draggable = Class.create({
       },
       endeffect: function(element) {
         var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
       },
       endeffect: function(element) {
         var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;

-        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, 
+        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,

           queue: {scope:'_draggable', position:'end'},
           queue: {scope:'_draggable', position:'end'},

-          afterFinish: function(){ 
-            Draggable._dragging[element] = false 
+          afterFinish: function(){
+            Draggable._dragging[element] = false

           }
           }

-        }); 
+        });

       },
       zindex: 1000,
       revert: false,
       },
       zindex: 1000,
       revert: false,


@@ -250,57 +250,57 @@ var Draggable = Class.create({
       snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
       delay: 0
     };
       snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
       delay: 0
     };

-    
+

     if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
       Object.extend(defaults, {
         starteffect: function(element) {
           element._opacity = Element.getOpacity(element);
           Draggable._dragging[element] = true;
     if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
       Object.extend(defaults, {
         starteffect: function(element) {
           element._opacity = Element.getOpacity(element);
           Draggable._dragging[element] = true;

-          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); 
+          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});

         }
       });
         }
       });

-    
+

     var options = Object.extend(defaults, arguments[1] || { });
 
     this.element = $(element);
     var options = Object.extend(defaults, arguments[1] || { });
 
     this.element = $(element);

-    
+

     if(options.handle && Object.isString(options.handle))
       this.handle = this.element.down('.'+options.handle, 0);
     if(options.handle && Object.isString(options.handle))
       this.handle = this.element.down('.'+options.handle, 0);

-    
+

     if(!this.handle) this.handle = $(options.handle);
     if(!this.handle) this.handle = this.element;
     if(!this.handle) this.handle = $(options.handle);
     if(!this.handle) this.handle = this.element;

-    
+

     if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
       options.scroll = $(options.scroll);
       this._isScrollChild = Element.childOf(this.element, options.scroll);
     }
 
     if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
       options.scroll = $(options.scroll);
       this._isScrollChild = Element.childOf(this.element, options.scroll);
     }
 

-    Element.makePositioned(this.element); // fix IE    
+    Element.makePositioned(this.element); // fix IE

 
     this.options  = options;
 
     this.options  = options;

-    this.dragging = false;   
+    this.dragging = false;

 
     this.eventMouseDown = this.initDrag.bindAsEventListener(this);
     Event.observe(this.handle, "mousedown", this.eventMouseDown);
 
     this.eventMouseDown = this.initDrag.bindAsEventListener(this);
     Event.observe(this.handle, "mousedown", this.eventMouseDown);

-    
+

     Draggables.register(this);
   },
     Draggables.register(this);
   },

-  
+

   destroy: function() {
     Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
     Draggables.unregister(this);
   },
   destroy: function() {
     Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
     Draggables.unregister(this);
   },

-  
+

   currentDelta: function() {
     return([
       parseInt(Element.getStyle(this.element,'left') || '0'),
       parseInt(Element.getStyle(this.element,'top') || '0')]);
   },
   currentDelta: function() {
     return([
       parseInt(Element.getStyle(this.element,'left') || '0'),
       parseInt(Element.getStyle(this.element,'top') || '0')]);
   },

-  
+

   initDrag: function(event) {
     if(!Object.isUndefined(Draggable._dragging[this.element]) &&
       Draggable._dragging[this.element]) return;
   initDrag: function(event) {
     if(!Object.isUndefined(Draggable._dragging[this.element]) &&
       Draggable._dragging[this.element]) return;

-    if(Event.isLeftClick(event)) {    
+    if(Event.isLeftClick(event)) {

       // abort on form elements, fixes a Firefox issue
       var src = Event.element(event);
       if((tag_name = src.tagName.toUpperCase()) && (
       // abort on form elements, fixes a Firefox issue
       var src = Event.element(event);
       if((tag_name = src.tagName.toUpperCase()) && (


@@ -309,34 +309,34 @@ var Draggable = Class.create({
         tag_name=='OPTION' ||
         tag_name=='BUTTON' ||
         tag_name=='TEXTAREA')) return;
         tag_name=='OPTION' ||
         tag_name=='BUTTON' ||
         tag_name=='TEXTAREA')) return;

-        
+

       var pointer = [Event.pointerX(event), Event.pointerY(event)];
       var pos     = Position.cumulativeOffset(this.element);
       this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
       var pointer = [Event.pointerX(event), Event.pointerY(event)];
       var pos     = Position.cumulativeOffset(this.element);
       this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });

-      
+

       Draggables.activate(this);
       Event.stop(event);
     }
   },
       Draggables.activate(this);
       Event.stop(event);
     }
   },

-  
+

   startDrag: function(event) {
     this.dragging = true;
     if(!this.delta)
       this.delta = this.currentDelta();
   startDrag: function(event) {
     this.dragging = true;
     if(!this.delta)
       this.delta = this.currentDelta();

-    
+

     if(this.options.zindex) {
       this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
       this.element.style.zIndex = this.options.zindex;
     }
     if(this.options.zindex) {
       this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
       this.element.style.zIndex = this.options.zindex;
     }

-    
+

     if(this.options.ghosting) {
       this._clone = this.element.cloneNode(true);
     if(this.options.ghosting) {
       this._clone = this.element.cloneNode(true);

-      this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
-      if (!this.element._originallyAbsolute)
+      this._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
+      if (!this._originallyAbsolute)

         Position.absolutize(this.element);
       this.element.parentNode.insertBefore(this._clone, this.element);
     }
         Position.absolutize(this.element);
       this.element.parentNode.insertBefore(this._clone, this.element);
     }

-    
+

     if(this.options.scroll) {
       if (this.options.scroll == window) {
         var where = this._getWindowScroll(this.options.scroll);
     if(this.options.scroll) {
       if (this.options.scroll == window) {
         var where = this._getWindowScroll(this.options.scroll);


@@ -347,28 +347,28 @@ var Draggable = Class.create({
         this.originalScrollTop = this.options.scroll.scrollTop;
       }
     }
         this.originalScrollTop = this.options.scroll.scrollTop;
       }
     }

-    
+

     Draggables.notify('onStart', this, event);
     Draggables.notify('onStart', this, event);

-        
+

     if(this.options.starteffect) this.options.starteffect(this.element);
   },
     if(this.options.starteffect) this.options.starteffect(this.element);
   },

-  
+

   updateDrag: function(event, pointer) {
     if(!this.dragging) this.startDrag(event);
   updateDrag: function(event, pointer) {
     if(!this.dragging) this.startDrag(event);

-    
+

     if(!this.options.quiet){
       Position.prepare();
       Droppables.show(pointer, this.element);
     }
     if(!this.options.quiet){
       Position.prepare();
       Droppables.show(pointer, this.element);
     }

-    
+

     Draggables.notify('onDrag', this, event);
     Draggables.notify('onDrag', this, event);

-    
+

     this.draw(pointer);
     if(this.options.change) this.options.change(this);
     this.draw(pointer);
     if(this.options.change) this.options.change(this);

-    
+

     if(this.options.scroll) {
       this.stopScrolling();
     if(this.options.scroll) {
       this.stopScrolling();

-      
+

       var p;
       if (this.options.scroll == window) {
         with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
       var p;
       if (this.options.scroll == window) {
         with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }


@@ -386,16 +386,16 @@ var Draggable = Class.create({
       if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
       this.startScrolling(speed);
     }
       if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
       this.startScrolling(speed);
     }

-    
+

     // fix AppleWebKit rendering
     if(Prototype.Browser.WebKit) window.scrollBy(0,0);
     // fix AppleWebKit rendering
     if(Prototype.Browser.WebKit) window.scrollBy(0,0);

-    
+

     Event.stop(event);
   },
     Event.stop(event);
   },

-  
+

   finishDrag: function(event, success) {
     this.dragging = false;
   finishDrag: function(event, success) {
     this.dragging = false;

-    
+

     if(this.options.quiet){
       Position.prepare();
       var pointer = [Event.pointerX(event), Event.pointerY(event)];
     if(this.options.quiet){
       Position.prepare();
       var pointer = [Event.pointerX(event), Event.pointerY(event)];


@@ -403,24 +403,24 @@ var Draggable = Class.create({
     }
 
     if(this.options.ghosting) {
     }
 
     if(this.options.ghosting) {

-      if (!this.element._originallyAbsolute)
+      if (!this._originallyAbsolute)

         Position.relativize(this.element);
         Position.relativize(this.element);

-      delete this.element._originallyAbsolute;
+      delete this._originallyAbsolute;

       Element.remove(this._clone);
       this._clone = null;
     }
 
       Element.remove(this._clone);
       this._clone = null;
     }
 

-    var dropped = false; 
-    if(success) { 
-      dropped = Droppables.fire(event, this.element); 
-      if (!dropped) dropped = false; 
+    var dropped = false;
+    if(success) {
+      dropped = Droppables.fire(event, this.element);
+      if (!dropped) dropped = false;

     }
     if(dropped && this.options.onDropped) this.options.onDropped(this.element);
     Draggables.notify('onEnd', this, event);
 
     var revert = this.options.revert;
     if(revert && Object.isFunction(revert)) revert = revert(this.element);
     }
     if(dropped && this.options.onDropped) this.options.onDropped(this.element);
     Draggables.notify('onEnd', this, event);
 
     var revert = this.options.revert;
     if(revert && Object.isFunction(revert)) revert = revert(this.element);

-    
+

     var d = this.currentDelta();
     if(revert && this.options.reverteffect) {
       if (dropped == 0 || revert != 'failure')
     var d = this.currentDelta();
     if(revert && this.options.reverteffect) {
       if (dropped == 0 || revert != 'failure')


@@ -433,67 +433,67 @@ var Draggable = Class.create({
     if(this.options.zindex)
       this.element.style.zIndex = this.originalZ;
 
     if(this.options.zindex)
       this.element.style.zIndex = this.originalZ;
 

-    if(this.options.endeffect) 
+    if(this.options.endeffect)

       this.options.endeffect(this.element);
       this.options.endeffect(this.element);

-      
+

     Draggables.deactivate(this);
     Droppables.reset();
   },
     Draggables.deactivate(this);
     Droppables.reset();
   },

-  
+

   keyPress: function(event) {
     if(event.keyCode!=Event.KEY_ESC) return;
     this.finishDrag(event, false);
     Event.stop(event);
   },
   keyPress: function(event) {
     if(event.keyCode!=Event.KEY_ESC) return;
     this.finishDrag(event, false);
     Event.stop(event);
   },

-  
+

   endDrag: function(event) {
     if(!this.dragging) return;
     this.stopScrolling();
     this.finishDrag(event, true);
     Event.stop(event);
   },
   endDrag: function(event) {
     if(!this.dragging) return;
     this.stopScrolling();
     this.finishDrag(event, true);
     Event.stop(event);
   },

-  
+

   draw: function(point) {
     var pos = Position.cumulativeOffset(this.element);
     if(this.options.ghosting) {
       var r   = Position.realOffset(this.element);
       pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
     }
   draw: function(point) {
     var pos = Position.cumulativeOffset(this.element);
     if(this.options.ghosting) {
       var r   = Position.realOffset(this.element);
       pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
     }

-    
+

     var d = this.currentDelta();
     pos[0] -= d[0]; pos[1] -= d[1];
     var d = this.currentDelta();
     pos[0] -= d[0]; pos[1] -= d[1];

-    
+

     if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
       pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
       pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
     }
     if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
       pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
       pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
     }

-    
-    var p = [0,1].map(function(i){ 
-      return (point[i]-pos[i]-this.offset[i]) 
+
+    var p = [0,1].map(function(i){
+      return (point[i]-pos[i]-this.offset[i])

     }.bind(this));
     }.bind(this));

-    
+

     if(this.options.snap) {
       if(Object.isFunction(this.options.snap)) {
         p = this.options.snap(p[0],p[1],this);
       } else {
       if(Object.isArray(this.options.snap)) {
         p = p.map( function(v, i) {
     if(this.options.snap) {
       if(Object.isFunction(this.options.snap)) {
         p = this.options.snap(p[0],p[1],this);
       } else {
       if(Object.isArray(this.options.snap)) {
         p = p.map( function(v, i) {

-          return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this))
+          return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this));

       } else {
         p = p.map( function(v) {
       } else {
         p = p.map( function(v) {

-          return (v/this.options.snap).round()*this.options.snap }.bind(this))
+          return (v/this.options.snap).round()*this.options.snap }.bind(this));

       }
     }}
       }
     }}

-    
+

     var style = this.element.style;
     if((!this.options.constraint) || (this.options.constraint=='horizontal'))
       style.left = p[0] + "px";
     if((!this.options.constraint) || (this.options.constraint=='vertical'))
       style.top  = p[1] + "px";
     var style = this.element.style;
     if((!this.options.constraint) || (this.options.constraint=='horizontal'))
       style.left = p[0] + "px";
     if((!this.options.constraint) || (this.options.constraint=='vertical'))
       style.top  = p[1] + "px";

-    
+

     if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
   },
     if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
   },

-  
+

   stopScrolling: function() {
     if(this.scrollInterval) {
       clearInterval(this.scrollInterval);
   stopScrolling: function() {
     if(this.scrollInterval) {
       clearInterval(this.scrollInterval);


@@ -501,14 +501,14 @@ var Draggable = Class.create({
       Draggables._lastScrollPointer = null;
     }
   },
       Draggables._lastScrollPointer = null;
     }
   },

-  
+

   startScrolling: function(speed) {
     if(!(speed[0] || speed[1])) return;
     this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
     this.lastScrolled = new Date();
     this.scrollInterval = setInterval(this.scroll.bind(this), 10);
   },
   startScrolling: function(speed) {
     if(!(speed[0] || speed[1])) return;
     this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
     this.lastScrolled = new Date();
     this.scrollInterval = setInterval(this.scroll.bind(this), 10);
   },

-  
+

   scroll: function() {
     var current = new Date();
     var delta = current - this.lastScrolled;
   scroll: function() {
     var current = new Date();
     var delta = current - this.lastScrolled;


@@ -524,7 +524,7 @@ var Draggable = Class.create({
       this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
       this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
     }
       this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
       this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
     }

-    
+

     Position.prepare();
     Droppables.show(Draggables._lastPointer, this.element);
     Draggables.notify('onDrag', this);
     Position.prepare();
     Droppables.show(Draggables._lastPointer, this.element);
     Draggables.notify('onDrag', this);


@@ -538,10 +538,10 @@ var Draggable = Class.create({
         Draggables._lastScrollPointer[1] = 0;
       this.draw(Draggables._lastScrollPointer);
     }
         Draggables._lastScrollPointer[1] = 0;
       this.draw(Draggables._lastScrollPointer);
     }

-    
+

     if(this.options.change) this.options.change(this);
   },
     if(this.options.change) this.options.change(this);
   },

-  
+

   _getWindowScroll: function(w) {
     var T, L, W, H;
     with (w.document) {
   _getWindowScroll: function(w) {
     var T, L, W, H;
     with (w.document) {


@@ -560,7 +560,7 @@ var Draggable = Class.create({
         H = documentElement.clientHeight;
       } else {
         W = body.offsetWidth;
         H = documentElement.clientHeight;
       } else {
         W = body.offsetWidth;

-        H = body.offsetHeight
+        H = body.offsetHeight;

       }
     }
     return { top: T, left: L, width: W, height: H };
       }
     }
     return { top: T, left: L, width: W, height: H };


@@ -577,11 +577,11 @@ var SortableObserver = Class.create({
     this.observer  = observer;
     this.lastValue = Sortable.serialize(this.element);
   },
     this.observer  = observer;
     this.lastValue = Sortable.serialize(this.element);
   },

-  
+

   onStart: function() {
     this.lastValue = Sortable.serialize(this.element);
   },
   onStart: function() {
     this.lastValue = Sortable.serialize(this.element);
   },

-  
+

   onEnd: function() {
     Sortable.unmark();
     if(this.lastValue != Sortable.serialize(this.element))
   onEnd: function() {
     Sortable.unmark();
     if(this.lastValue != Sortable.serialize(this.element))


@@ -591,11 +591,11 @@ var SortableObserver = Class.create({
 
 var Sortable = {
   SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
 
 var Sortable = {
   SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,

-  
+

   sortables: { },
   sortables: { },

-  
+

   _findRootElement: function(element) {
   _findRootElement: function(element) {

-    while (element.tagName.toUpperCase() != "BODY") {  
+    while (element.tagName.toUpperCase() != "BODY") {

       if(element.id && Sortable.sortables[element.id]) return element;
       element = element.parentNode;
     }
       if(element.id && Sortable.sortables[element.id]) return element;
       element = element.parentNode;
     }


@@ -606,22 +606,23 @@ var Sortable = {
     if(!element) return;
     return Sortable.sortables[element.id];
   },
     if(!element) return;
     return Sortable.sortables[element.id];
   },

-  
+

   destroy: function(element){
   destroy: function(element){

-    var s = Sortable.options(element);
-    
+    element = $(element);
+    var s = Sortable.sortables[element.id];
+

     if(s) {
       Draggables.removeObserver(s.element);
       s.droppables.each(function(d){ Droppables.remove(d) });
       s.draggables.invoke('destroy');
     if(s) {
       Draggables.removeObserver(s.element);
       s.droppables.each(function(d){ Droppables.remove(d) });
       s.draggables.invoke('destroy');

-      
+

       delete Sortable.sortables[s.element.id];
     }
   },
 
   create: function(element) {
     element = $(element);
       delete Sortable.sortables[s.element.id];
     }
   },
 
   create: function(element) {
     element = $(element);

-    var options = Object.extend({ 
+    var options = Object.extend({

       element:     element,
       tag:         'li',       // assumes li children, override with tag: 'tagname'
       dropOnEmpty: false,
       element:     element,
       tag:         'li',       // assumes li children, override with tag: 'tagname'
       dropOnEmpty: false,


@@ -635,17 +636,17 @@ var Sortable = {
       delay:       0,
       hoverclass:  null,
       ghosting:    false,
       delay:       0,
       hoverclass:  null,
       ghosting:    false,

-      quiet:       false, 
+      quiet:       false,

       scroll:      false,
       scrollSensitivity: 20,
       scrollSpeed: 15,
       format:      this.SERIALIZE_RULE,
       scroll:      false,
       scrollSensitivity: 20,
       scrollSpeed: 15,
       format:      this.SERIALIZE_RULE,

-      
-      // these take arrays of elements or ids and can be 
+
+      // these take arrays of elements or ids and can be

       // used for better initialization performance
       elements:    false,
       handles:     false,
       // used for better initialization performance
       elements:    false,
       handles:     false,

-      
+

       onChange:    Prototype.emptyFunction,
       onUpdate:    Prototype.emptyFunction
     }, arguments[1] || { });
       onChange:    Prototype.emptyFunction,
       onUpdate:    Prototype.emptyFunction
     }, arguments[1] || { });


@@ -682,24 +683,24 @@ var Sortable = {
     if(options.zindex)
       options_for_draggable.zindex = options.zindex;
 
     if(options.zindex)
       options_for_draggable.zindex = options.zindex;
 

-    // build options for the droppables  
+    // build options for the droppables

     var options_for_droppable = {
       overlap:     options.overlap,
       containment: options.containment,
       tree:        options.tree,
       hoverclass:  options.hoverclass,
       onHover:     Sortable.onHover
     var options_for_droppable = {
       overlap:     options.overlap,
       containment: options.containment,
       tree:        options.tree,
       hoverclass:  options.hoverclass,
       onHover:     Sortable.onHover

-    }
-    
+    };
+

     var options_for_tree = {
       onHover:      Sortable.onEmptyHover,
       overlap:      options.overlap,
       containment:  options.containment,
       hoverclass:   options.hoverclass
     var options_for_tree = {
       onHover:      Sortable.onEmptyHover,
       overlap:      options.overlap,
       containment:  options.containment,
       hoverclass:   options.hoverclass

-    }
+    };

 
     // fix for gecko engine
 
     // fix for gecko engine

-    Element.cleanWhitespace(element); 
+    Element.cleanWhitespace(element);

 
     options.draggables = [];
     options.droppables = [];
 
     options.draggables = [];
     options.droppables = [];


@@ -712,14 +713,14 @@ var Sortable = {
 
     (options.elements || this.findElements(element, options) || []).each( function(e,i) {
       var handle = options.handles ? $(options.handles[i]) :
 
     (options.elements || this.findElements(element, options) || []).each( function(e,i) {
       var handle = options.handles ? $(options.handles[i]) :

-        (options.handle ? $(e).select('.' + options.handle)[0] : e); 
+        (options.handle ? $(e).select('.' + options.handle)[0] : e);

       options.draggables.push(
         new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
       Droppables.add(e, options_for_droppable);
       if(options.tree) e.treeNode = element;
       options.draggables.push(
         new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
       Droppables.add(e, options_for_droppable);
       if(options.tree) e.treeNode = element;

-      options.droppables.push(e);      
+      options.droppables.push(e);

     });
     });

-    
+

     if(options.tree) {
       (Sortable.findTreeElements(element, options) || []).each( function(e) {
         Droppables.add(e, options_for_tree);
     if(options.tree) {
       (Sortable.findTreeElements(element, options) || []).each( function(e) {
         Droppables.add(e, options_for_tree);


@@ -741,7 +742,7 @@ var Sortable = {
     return Element.findChildren(
       element, options.only, options.tree ? true : false, options.tag);
   },
     return Element.findChildren(
       element, options.only, options.tree ? true : false, options.tag);
   },

-  
+

   findTreeElements: function(element, options) {
     return Element.findChildren(
       element, options.only, options.tree ? true : false, options.treeTag);
   findTreeElements: function(element, options) {
     return Element.findChildren(
       element, options.only, options.tree ? true : false, options.treeTag);


@@ -758,7 +759,7 @@ var Sortable = {
         var oldParentNode = element.parentNode;
         element.style.visibility = "hidden"; // fix gecko rendering
         dropon.parentNode.insertBefore(element, dropon);
         var oldParentNode = element.parentNode;
         element.style.visibility = "hidden"; // fix gecko rendering
         dropon.parentNode.insertBefore(element, dropon);

-        if(dropon.parentNode!=oldParentNode) 
+        if(dropon.parentNode!=oldParentNode)

           Sortable.options(oldParentNode).onChange(element);
         Sortable.options(dropon.parentNode).onChange(element);
       }
           Sortable.options(oldParentNode).onChange(element);
         Sortable.options(dropon.parentNode).onChange(element);
       }


@@ -769,26 +770,26 @@ var Sortable = {
         var oldParentNode = element.parentNode;
         element.style.visibility = "hidden"; // fix gecko rendering
         dropon.parentNode.insertBefore(element, nextElement);
         var oldParentNode = element.parentNode;
         element.style.visibility = "hidden"; // fix gecko rendering
         dropon.parentNode.insertBefore(element, nextElement);

-        if(dropon.parentNode!=oldParentNode) 
+        if(dropon.parentNode!=oldParentNode)

           Sortable.options(oldParentNode).onChange(element);
         Sortable.options(dropon.parentNode).onChange(element);
       }
     }
   },
           Sortable.options(oldParentNode).onChange(element);
         Sortable.options(dropon.parentNode).onChange(element);
       }
     }
   },

-  
+

   onEmptyHover: function(element, dropon, overlap) {
     var oldParentNode = element.parentNode;
     var droponOptions = Sortable.options(dropon);
   onEmptyHover: function(element, dropon, overlap) {
     var oldParentNode = element.parentNode;
     var droponOptions = Sortable.options(dropon);

-        
+

     if(!Element.isParent(dropon, element)) {
       var index;
     if(!Element.isParent(dropon, element)) {
       var index;

-      
+

       var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
       var child = null;
       var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
       var child = null;

-            
+

       if(children) {
         var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
       if(children) {
         var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);

-        
+

         for (index = 0; index < children.length; index += 1) {
           if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
             offset -= Element.offsetSize (children[index], droponOptions.overlap);
         for (index = 0; index < children.length; index += 1) {
           if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
             offset -= Element.offsetSize (children[index], droponOptions.overlap);


@@ -801,9 +802,9 @@ var Sortable = {
           }
         }
       }
           }
         }
       }

-      
+

       dropon.insertBefore(element, child);
       dropon.insertBefore(element, child);

-      
+

       Sortable.options(oldParentNode).onChange(element);
       droponOptions.onChange(element);
     }
       Sortable.options(oldParentNode).onChange(element);
       droponOptions.onChange(element);
     }


@@ -816,34 +817,34 @@ var Sortable = {
   mark: function(dropon, position) {
     // mark on ghosting only
     var sortable = Sortable.options(dropon.parentNode);
   mark: function(dropon, position) {
     // mark on ghosting only
     var sortable = Sortable.options(dropon.parentNode);

-    if(sortable && !sortable.ghosting) return; 
+    if(sortable && !sortable.ghosting) return;

 
     if(!Sortable._marker) {
 
     if(!Sortable._marker) {

-      Sortable._marker = 
+      Sortable._marker =

         ($('dropmarker') || Element.extend(document.createElement('DIV'))).
           hide().addClassName('dropmarker').setStyle({position:'absolute'});
       document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
         ($('dropmarker') || Element.extend(document.createElement('DIV'))).
           hide().addClassName('dropmarker').setStyle({position:'absolute'});
       document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);

-    }    
+    }

     var offsets = Position.cumulativeOffset(dropon);
     Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
     var offsets = Position.cumulativeOffset(dropon);
     Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});

-    
+

     if(position=='after')
     if(position=='after')

-      if(sortable.overlap == 'horizontal') 
+      if(sortable.overlap == 'horizontal')

         Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
       else
         Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
         Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
       else
         Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});

-    
+

     Sortable._marker.show();
   },
     Sortable._marker.show();
   },

-  
+

   _tree: function(element, options, parent) {
     var children = Sortable.findElements(element, options) || [];
   _tree: function(element, options, parent) {
     var children = Sortable.findElements(element, options) || [];

-  
+

     for (var i = 0; i < children.length; ++i) {
       var match = children[i].id.match(options.format);
 
       if (!match) continue;
     for (var i = 0; i < children.length; ++i) {
       var match = children[i].id.match(options.format);
 
       if (!match) continue;

-      
+

       var child = {
         id: encodeURIComponent(match ? match[1] : null),
         element: element,
       var child = {
         id: encodeURIComponent(match ? match[1] : null),
         element: element,


@@ -851,16 +852,16 @@ var Sortable = {
         children: [],
         position: parent.children.length,
         container: $(children[i]).down(options.treeTag)
         children: [],
         position: parent.children.length,
         container: $(children[i]).down(options.treeTag)

-      }
-      
+      };
+

       /* Get the element containing the children and recurse over it */
       if (child.container)
       /* Get the element containing the children and recurse over it */
       if (child.container)

-        this._tree(child.container, options, child)
-      
+        this._tree(child.container, options, child);
+

       parent.children.push (child);
     }
 
       parent.children.push (child);
     }
 

-    return parent; 
+    return parent;

   },
 
   tree: function(element) {
   },
 
   tree: function(element) {


@@ -873,15 +874,15 @@ var Sortable = {
       name: element.id,
       format: sortableOptions.format
     }, arguments[1] || { });
       name: element.id,
       format: sortableOptions.format
     }, arguments[1] || { });

-    
+

     var root = {
       id: null,
       parent: null,
       children: [],
       container: element,
       position: 0
     var root = {
       id: null,
       parent: null,
       children: [],
       container: element,
       position: 0

-    }
-    
+    };
+

     return Sortable._tree(element, options, root);
   },
 
     return Sortable._tree(element, options, root);
   },
 


@@ -897,7 +898,7 @@ var Sortable = {
   sequence: function(element) {
     element = $(element);
     var options = Object.extend(this.options(element), arguments[1] || { });
   sequence: function(element) {
     element = $(element);
     var options = Object.extend(this.options(element), arguments[1] || { });

-    
+

     return $(this.findElements(element, options) || []).map( function(item) {
       return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
     });
     return $(this.findElements(element, options) || []).map( function(item) {
       return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
     });


@@ -906,14 +907,14 @@ var Sortable = {
   setSequence: function(element, new_sequence) {
     element = $(element);
     var options = Object.extend(this.options(element), arguments[2] || { });
   setSequence: function(element, new_sequence) {
     element = $(element);
     var options = Object.extend(this.options(element), arguments[2] || { });

-    
+

     var nodeMap = { };
     this.findElements(element, options).each( function(n) {
         if (n.id.match(options.format))
             nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
         n.parentNode.removeChild(n);
     });
     var nodeMap = { };
     this.findElements(element, options).each( function(n) {
         if (n.id.match(options.format))
             nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
         n.parentNode.removeChild(n);
     });

-   
+

     new_sequence.each(function(ident) {
       var n = nodeMap[ident];
       if (n) {
     new_sequence.each(function(ident) {
       var n = nodeMap[ident];
       if (n) {


@@ -922,16 +923,16 @@ var Sortable = {
       }
     });
   },
       }
     });
   },

-  
+

   serialize: function(element) {
     element = $(element);
     var options = Object.extend(Sortable.options(element), arguments[1] || { });
     var name = encodeURIComponent(
       (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
   serialize: function(element) {
     element = $(element);
     var options = Object.extend(Sortable.options(element), arguments[1] || { });
     var name = encodeURIComponent(
       (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);

-    
+

     if (options.tree) {
       return Sortable.tree(element, arguments[1]).children.map( function (item) {
     if (options.tree) {
       return Sortable.tree(element, arguments[1]).children.map( function (item) {

-        return [name + Sortable._constructIndex(item) + "[id]=" + 
+        return [name + Sortable._constructIndex(item) + "[id]=" +

                 encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
       }).flatten().join('&');
     } else {
                 encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
       }).flatten().join('&');
     } else {


@@ -940,16 +941,16 @@ var Sortable = {
       }).join('&');
     }
   }
       }).join('&');
     }
   }

-}
+};

 
 // Returns true if child is contained within element
 Element.isParent = function(child, element) {
   if (!child.parentNode || child == element) return false;
   if (child.parentNode == element) return true;
   return Element.isParent(child.parentNode, element);
 
 // Returns true if child is contained within element
 Element.isParent = function(child, element) {
   if (!child.parentNode || child == element) return false;
   if (child.parentNode == element) return true;
   return Element.isParent(child.parentNode, element);

-}
+};

 
 

-Element.findChildren = function(element, only, recursive, tagName) {   
+Element.findChildren = function(element, only, recursive, tagName) {

   if(!element.hasChildNodes()) return null;
   tagName = tagName.toUpperCase();
   if(only) only = [only].flatten();
   if(!element.hasChildNodes()) return null;
   tagName = tagName.toUpperCase();
   if(only) only = [only].flatten();


@@ -965,8 +966,8 @@ Element.findChildren = function(element, only, recursive, tagName) {
   });
 
   return (elements.length>0 ? elements.flatten() : []);
   });
 
   return (elements.length>0 ? elements.flatten() : []);

-}
+};

 
 Element.offsetSize = function (element, type) {
   return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
 
 Element.offsetSize = function (element, type) {
   return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];

-}
+};
\ No newline at end of file