Changeset 1648:2eee4ee2798e

Timestamp:

08/25/13 20:39:43 (10 years ago)

Author:

Lepeltier kévin

Branch:

Ticket #1604

Message:

Ticket #1604
remplacement des div par des ul li
Ajout de draggable dans jQuery ui
Ajout de sortable et draggable version ui il manque la supression
L'avertissement "No widget" est permanent, mais masqué par js ('display none') je suppose que ça va pas le faire avec a11y

Files:

• admin/js/jquery/jquery-ui.custom.js (modified) (91 diffs)
• plugins/widgets/dragdrop.js (modified) (1 diff)
• plugins/widgets/index.php (modified) (9 diffs)
• plugins/widgets/style.css (modified) (3 diffs)
• plugins/widgets/widgets.js (modified) (4 diffs)

admin/js/jquery/jquery-ui.custom.js

@@ -1 @@
-/*! jQuery UI - v1.9.2 - 2012-11-29
+/*! jQuery UI - v1.10.3 - 2013-08-23
 * http://jqueryui.com
-* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.sortable.js, jquery.ui.accordion.js
-* Copyright (c) 2012 jQuery Foundation and other contributors Licensed MIT */
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.draggable.js, jquery.ui.sortable.js, jquery.ui.accordion.js
+* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */
 
 (function( $, undefined ) {
@@ -9 +9 @@
      runiqueId = /^ui-id-\d+$/;
 
-// prevent duplicate loading
-// this is only a problem because we proxy existing functions
-// and we don't want to double proxy them
+// $.ui might exist from components with no dependencies, e.g., $.ui.position
 $.ui = $.ui || {};
-if ( $.ui.version ) {
-     return;
-}
 
 $.extend( $.ui, {
-     version: "1.9.2",
+     version: "1.10.3",
 
      keyCode: {
@@ -48 +43 @@
 // plugins
 $.fn.extend({
-     _focus: $.fn.focus,
-     focus: function( delay, fn ) {
-          return typeof delay === "number" ?
-               this.each(function() {
-                    var elem = this;
-                    setTimeout(function() {
-                         $( elem ).focus();
-                         if ( fn ) {
-                              fn.call( elem );
-                         }
-                    }, delay );
-               }) :
-               this._focus.apply( this, arguments );
-     },
+     focus: (function( orig ) {
+          return function( delay, fn ) {
+               return typeof delay === "number" ?
+                    this.each(function() {
+                         var elem = this;
+                         setTimeout(function() {
+                              $( elem ).focus();
+                              if ( fn ) {
+                                   fn.call( elem );
+                              }
+                         }, delay );
+                    }) :
+                    orig.apply( this, arguments );
+          };
+     })( $.fn.focus ),
 
      scrollParent: function() {
           var scrollParent;
-          if (($.ui.ie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
+          if (($.ui.ie && (/(static|relative)/).test(this.css("position"))) || (/absolute/).test(this.css("position"))) {
                scrollParent = this.parents().filter(function() {
-                    return (/(relative|absolute|fixed)/).test($.css(this,'position')) && (/(auto|scroll)/).test($.css(this,'overflow')+$.css(this,'overflow-y')+$.css(this,'overflow-x'));
+                    return (/(relative|absolute|fixed)/).test($.css(this,"position")) && (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x"));
                }).eq(0);
           } else {
                scrollParent = this.parents().filter(function() {
-                    return (/(auto|scroll)/).test($.css(this,'overflow')+$.css(this,'overflow-y')+$.css(this,'overflow-x'));
+                    return (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x"));
                }).eq(0);
           }
 
-          return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent;
+          return (/fixed/).test(this.css("position")) || !scrollParent.length ? $(document) : scrollParent;
      },
 
@@ -148 +144 @@
 function visible( element ) {
      return $.expr.filters.visible( element ) &&
-          !$( element ).parents().andSelf().filter(function() {
+          !$( element ).parents().addBack().filter(function() {
                return $.css( this, "visibility" ) === "hidden";
           }).length;
@@ -176 +172 @@
 });
 
-// support
-$(function() {
-     var body = document.body,
-          div = body.appendChild( div = document.createElement( "div" ) );
-
-     // access offsetHeight before setting the style to prevent a layout bug
-     // in IE 9 which causes the element to continue to take up space even
-     // after it is removed from the DOM (#8026)
-     div.offsetHeight;
-
-     $.extend( div.style, {
-          minHeight: "100px",
-          height: "auto",
-          padding: 0,
-          borderWidth: 0
-     });
-
-     $.support.minHeight = div.offsetHeight === 100;
-     $.support.selectstart = "onselectstart" in div;
-
-     // set display to none to avoid a layout bug in IE
-     // http://dev.jquery.com/ticket/4014
-     body.removeChild( div ).style.display = "none";
-});
-
 // support: jQuery <1.8
 if ( !$( "<a>" ).outerWidth( 1 ).jquery ) {
@@ -248 +219 @@
 }
 
+// support: jQuery <1.8
+if ( !$.fn.addBack ) {
+     $.fn.addBack = function( selector ) {
+          return this.add( selector == null ?
+               this.prevObject : this.prevObject.filter( selector )
+          );
+     };
+}
+
 // support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413)
 if ( $( "<a>" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) {
@@ -266 +246 @@
 
 // deprecated
-
-(function() {
-     var uaMatch = /msie ([\w.]+)/.exec( navigator.userAgent.toLowerCase() ) || [];
-     $.ui.ie = uaMatch.length ? true : false;
-     $.ui.ie6 = parseFloat( uaMatch[ 1 ], 10 ) === 6;
-})();
-
+$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
+
+$.support.selectstart = "onselectstart" in document.createElement( "div" );
 $.fn.extend({
      disableSelection: function() {
@@ -287 +263 @@
 
 $.extend( $.ui, {
-     // $.ui.plugin is deprecated.  Use the proxy pattern instead.
+     // $.ui.plugin is deprecated. Use $.widget() extensions instead.
      plugin: {
           add: function( module, option, set ) {
@@ -312 +288 @@
      },
 
-     contains: $.contains,
-
      // only used by resizable
      hasScroll: function( el, a ) {
@@ -336 +310 @@
           el[ scroll ] = 0;
           return has;
-     },
-
-     // these are odd functions, fix the API or move into individual plugins
-     isOverAxis: function( x, reference, size ) {
-          //Determines when x coordinate is over "b" element axis
-          return ( x > reference ) && ( x < ( reference + size ) );
-     },
-     isOver: function( y, x, top, left, height, width ) {
-          //Determines when x, y coordinates is over "b" element
-          return $.ui.isOverAxis( y, top, height ) && $.ui.isOverAxis( x, left, width );
      }
 });
@@ -367 +331 @@
 $.widget = function( name, base, prototype ) {
      var fullName, existingConstructor, constructor, basePrototype,
+          // proxiedPrototype allows the provided prototype to remain unmodified
+          // so that it can be used as a mixin for multiple widgets (#8876)
+          proxiedPrototype = {},
           namespace = name.split( "." )[ 0 ];
 
@@ -413 +380 @@
      basePrototype.options = $.widget.extend( {}, basePrototype.options );
      $.each( prototype, function( prop, value ) {
-          if ( $.isFunction( value ) ) {
-               prototype[ prop ] = (function() {
-                    var _super = function() {
-                              return base.prototype[ prop ].apply( this, arguments );
-                         },
-                         _superApply = function( args ) {
-                              return base.prototype[ prop ].apply( this, args );
-                         };
-                    return function() {
-                         var __super = this._super,
-                              __superApply = this._superApply,
-                              returnValue;
-
-                         this._super = _super;
-                         this._superApply = _superApply;
-
-                         returnValue = value.apply( this, arguments );
-
-                         this._super = __super;
-                         this._superApply = __superApply;
-
-                         return returnValue;
+          if ( !$.isFunction( value ) ) {
+               proxiedPrototype[ prop ] = value;
+               return;
+          }
+          proxiedPrototype[ prop ] = (function() {
+               var _super = function() {
+                         return base.prototype[ prop ].apply( this, arguments );
+                    },
+                    _superApply = function( args ) {
+                         return base.prototype[ prop ].apply( this, args );
                     };
-               })();
-          }
+               return function() {
+                    var __super = this._super,
+                         __superApply = this._superApply,
+                         returnValue;
+
+                    this._super = _super;
+                    this._superApply = _superApply;
+
+                    returnValue = value.apply( this, arguments );
+
+                    this._super = __super;
+                    this._superApply = __superApply;
+
+                    return returnValue;
+               };
+          })();
      });
      constructor.prototype = $.widget.extend( basePrototype, {
@@ -444 +413 @@
           // don't prefix for widgets that aren't DOM-based
           widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name
-     }, prototype, {
+     }, proxiedPrototype, {
           constructor: constructor,
           namespace: namespace,
           widgetName: name,
-          // TODO remove widgetBaseClass, see #8155
-          widgetBaseClass: fullName,
           widgetFullName: fullName
      });
@@ -575 +542 @@
 
           if ( element !== this ) {
-               // 1.9 BC for #7810
-               // TODO remove dual storage
-               $.data( element, this.widgetName, this );
                $.data( element, this.widgetFullName, this );
                this._on( true, this.element, {
@@ -844 +808 @@
                element.delay( options.delay );
           }
-          if ( hasOptions && $.effects && ( $.effects.effect[ effectName ] || $.uiBackCompat !== false && $.effects[ effectName ] ) ) {
+          if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
                element[ method ]( options );
           } else if ( effectName !== method && element[ effectName ] ) {
@@ -860 +824 @@
 });
 
-// DEPRECATED
-if ( $.uiBackCompat !== false ) {
-     $.Widget.prototype._getCreateOptions = function() {
-          return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ];
-     };
-}
-
 })( jQuery );
 (function( $, undefined ) {
 
 var mouseHandled = false;
-$( document ).mouseup( function( e ) {
+$( document ).mouseup( function() {
      mouseHandled = false;
 });
 
 $.widget("ui.mouse", {
-     version: "1.9.2",
+     version: "1.10.3",
      options: {
-          cancel: 'input,textarea,button,select,option',
+          cancel: "input,textarea,button,select,option",
           distance: 1,
           delay: 0
@@ -886 +843 @@
 
           this.element
-               .bind('mousedown.'+this.widgetName, function(event) {
+               .bind("mousedown."+this.widgetName, function(event) {
                     return that._mouseDown(event);
                })
-               .bind('click.'+this.widgetName, function(event) {
-                    if (true === $.data(event.target, that.widgetName + '.preventClickEvent')) {
-                         $.removeData(event.target, that.widgetName + '.preventClickEvent');
+               .bind("click."+this.widgetName, function(event) {
+                    if (true === $.data(event.target, that.widgetName + ".preventClickEvent")) {
+                         $.removeData(event.target, that.widgetName + ".preventClickEvent");
                          event.stopImmediatePropagation();
                          return false;
@@ -903 +860 @@
      // other instances of mouse
      _mouseDestroy: function() {
-          this.element.unbind('.'+this.widgetName);
+          this.element.unbind("."+this.widgetName);
           if ( this._mouseMoveDelegate ) {
                $(document)
-                    .unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
-                    .unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+                    .unbind("mousemove."+this.widgetName, this._mouseMoveDelegate)
+                    .unbind("mouseup."+this.widgetName, this._mouseUpDelegate);
           }
      },
@@ -945 +902 @@
 
           // Click event may never have fired (Gecko & Opera)
-          if (true === $.data(event.target, this.widgetName + '.preventClickEvent')) {
-               $.removeData(event.target, this.widgetName + '.preventClickEvent');
+          if (true === $.data(event.target, this.widgetName + ".preventClickEvent")) {
+               $.removeData(event.target, this.widgetName + ".preventClickEvent");
           }
 
@@ -957 +914 @@
           };
           $(document)
-               .bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
-               .bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+               .bind("mousemove."+this.widgetName, this._mouseMoveDelegate)
+               .bind("mouseup."+this.widgetName, this._mouseUpDelegate);
 
           event.preventDefault();
@@ -968 +925 @@
      _mouseMove: function(event) {
           // IE mouseup check - mouseup happened when mouse was out of window
-          if ($.ui.ie && !(document.documentMode >= 9) && !event.button) {
+          if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) {
                return this._mouseUp(event);
           }
@@ -988 +945 @@
      _mouseUp: function(event) {
           $(document)
-               .unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
-               .unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+               .unbind("mousemove."+this.widgetName, this._mouseMoveDelegate)
+               .unbind("mouseup."+this.widgetName, this._mouseUpDelegate);
 
           if (this._mouseStarted) {
@@ -995 +952 @@
 
                if (event.target === this._mouseDownEvent.target) {
-                    $.data(event.target, this.widgetName + '.preventClickEvent', true);
+                    $.data(event.target, this.widgetName + ".preventClickEvent", true);
                }
 
@@ -1012 +969 @@
      },
 
-     _mouseDelayMet: function(event) {
+     _mouseDelayMet: function(/* event */) {
           return this.mouseDelayMet;
      },
 
      // These are placeholder methods, to be overriden by extending plugin
-     _mouseStart: function(event) {},
-     _mouseDrag: function(event) {},
-     _mouseStop: function(event) {},
-     _mouseCapture: function(event) { return true; }
+     _mouseStart: function(/* event */) {},
+     _mouseDrag: function(/* event */) {},
+     _mouseStop: function(/* event */) {},
+     _mouseCapture: function(/* event */) { return true; }
 });
 
@@ -1026 +983 @@
 (function( $, undefined ) {
 
+$.widget("ui.draggable", $.ui.mouse, {
+     version: "1.10.3",
+     widgetEventPrefix: "drag",
+     options: {
+          addClasses: true,
+          appendTo: "parent",
+          axis: false,
+          connectToSortable: false,
+          containment: false,
+          cursor: "auto",
+          cursorAt: false,
+          grid: false,
+          handle: false,
+          helper: "original",
+          iframeFix: false,
+          opacity: false,
+          refreshPositions: false,
+          revert: false,
+          revertDuration: 500,
+          scope: "default",
+          scroll: true,
+          scrollSensitivity: 20,
+          scrollSpeed: 20,
+          snap: false,
+          snapMode: "both",
+          snapTolerance: 20,
+          stack: false,
+          zIndex: false,
+
+          // callbacks
+          drag: null,
+          start: null,
+          stop: null
+     },
+     _create: function() {
+
+          if (this.options.helper === "original" && !(/^(?:r|a|f)/).test(this.element.css("position"))) {
+               this.element[0].style.position = "relative";
+          }
+          if (this.options.addClasses){
+               this.element.addClass("ui-draggable");
+          }
+          if (this.options.disabled){
+               this.element.addClass("ui-draggable-disabled");
+          }
+
+          this._mouseInit();
+
+     },
+
+     _destroy: function() {
+          this.element.removeClass( "ui-draggable ui-draggable-dragging ui-draggable-disabled" );
+          this._mouseDestroy();
+     },
+
+     _mouseCapture: function(event) {
+
+          var o = this.options;
+
+          // among others, prevent a drag on a resizable-handle
+          if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) {
+               return false;
+          }
+
+          //Quit if we're not on a valid handle
+          this.handle = this._getHandle(event);
+          if (!this.handle) {
+               return false;
+          }
+
+          $(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
+               $("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>")
+               .css({
+                    width: this.offsetWidth+"px", height: this.offsetHeight+"px",
+                    position: "absolute", opacity: "0.001", zIndex: 1000
+               })
+               .css($(this).offset())
+               .appendTo("body");
+          });
+
+          return true;
+
+     },
+
+     _mouseStart: function(event) {
+
+          var o = this.options;
+
+          //Create and append the visible helper
+          this.helper = this._createHelper(event);
+
+          this.helper.addClass("ui-draggable-dragging");
+
+          //Cache the helper size
+          this._cacheHelperProportions();
+
+          //If ddmanager is used for droppables, set the global draggable
+          if($.ui.ddmanager) {
+               $.ui.ddmanager.current = this;
+          }
+
+          /*
+           * - Position generation -
+           * This block generates everything position related - it's the core of draggables.
+           */
+
+          //Cache the margins of the original element
+          this._cacheMargins();
+
+          //Store the helper's css position
+          this.cssPosition = this.helper.css( "position" );
+          this.scrollParent = this.helper.scrollParent();
+          this.offsetParent = this.helper.offsetParent();
+          this.offsetParentCssPosition = this.offsetParent.css( "position" );
+
+          //The element's absolute position on the page minus margins
+          this.offset = this.positionAbs = this.element.offset();
+          this.offset = {
+               top: this.offset.top - this.margins.top,
+               left: this.offset.left - this.margins.left
+          };
+
+          //Reset scroll cache
+          this.offset.scroll = false;
+
+          $.extend(this.offset, {
+               click: { //Where the click happened, relative to the element
+                    left: event.pageX - this.offset.left,
+                    top: event.pageY - this.offset.top
+               },
+               parent: this._getParentOffset(),
+               relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+          });
+
+          //Generate the original position
+          this.originalPosition = this.position = this._generatePosition(event);
+          this.originalPageX = event.pageX;
+          this.originalPageY = event.pageY;
+
+          //Adjust the mouse offset relative to the helper if "cursorAt" is supplied
+          (o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+          //Set a containment if given in the options
+          this._setContainment();
+
+          //Trigger event + callbacks
+          if(this._trigger("start", event) === false) {
+               this._clear();
+               return false;
+          }
+
+          //Recache the helper size
+          this._cacheHelperProportions();
+
+          //Prepare the droppable offsets
+          if ($.ui.ddmanager && !o.dropBehaviour) {
+               $.ui.ddmanager.prepareOffsets(this, event);
+          }
+
+
+          this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+
+          //If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
+          if ( $.ui.ddmanager ) {
+               $.ui.ddmanager.dragStart(this, event);
+          }
+
+          return true;
+     },
+
+     _mouseDrag: function(event, noPropagation) {
+          // reset any necessary cached properties (see #5009)
+          if ( this.offsetParentCssPosition === "fixed" ) {
+               this.offset.parent = this._getParentOffset();
+          }
+
+          //Compute the helpers position
+          this.position = this._generatePosition(event);
+          this.positionAbs = this._convertPositionTo("absolute");
+
+          //Call plugins and callbacks and use the resulting position if something is returned
+          if (!noPropagation) {
+               var ui = this._uiHash();
+               if(this._trigger("drag", event, ui) === false) {
+                    this._mouseUp({});
+                    return false;
+               }
+               this.position = ui.position;
+          }
+
+          if(!this.options.axis || this.options.axis !== "y") {
+               this.helper[0].style.left = this.position.left+"px";
+          }
+          if(!this.options.axis || this.options.axis !== "x") {
+               this.helper[0].style.top = this.position.top+"px";
+          }
+          if($.ui.ddmanager) {
+               $.ui.ddmanager.drag(this, event);
+          }
+
+          return false;
+     },
+
+     _mouseStop: function(event) {
+
+          //If we are using droppables, inform the manager about the drop
+          var that = this,
+               dropped = false;
+          if ($.ui.ddmanager && !this.options.dropBehaviour) {
+               dropped = $.ui.ddmanager.drop(this, event);
+          }
+
+          //if a drop comes from outside (a sortable)
+          if(this.dropped) {
+               dropped = this.dropped;
+               this.dropped = false;
+          }
+
+          //if the original element is no longer in the DOM don't bother to continue (see #8269)
+          if ( this.options.helper === "original" && !$.contains( this.element[ 0 ].ownerDocument, this.element[ 0 ] ) ) {
+               return false;
+          }
+
+          if((this.options.revert === "invalid" && !dropped) || (this.options.revert === "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
+               $(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
+                    if(that._trigger("stop", event) !== false) {
+                         that._clear();
+                    }
+               });
+          } else {
+               if(this._trigger("stop", event) !== false) {
+                    this._clear();
+               }
+          }
+
+          return false;
+     },
+
+     _mouseUp: function(event) {
+          //Remove frame helpers
+          $("div.ui-draggable-iframeFix").each(function() {
+               this.parentNode.removeChild(this);
+          });
+
+          //If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
+          if( $.ui.ddmanager ) {
+               $.ui.ddmanager.dragStop(this, event);
+          }
+
+          return $.ui.mouse.prototype._mouseUp.call(this, event);
+     },
+
+     cancel: function() {
+
+          if(this.helper.is(".ui-draggable-dragging")) {
+               this._mouseUp({});
+          } else {
+               this._clear();
+          }
+
+          return this;
+
+     },
+
+     _getHandle: function(event) {
+          return this.options.handle ?
+               !!$( event.target ).closest( this.element.find( this.options.handle ) ).length :
+               true;
+     },
+
+     _createHelper: function(event) {
+
+          var o = this.options,
+               helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper === "clone" ? this.element.clone().removeAttr("id") : this.element);
+
+          if(!helper.parents("body").length) {
+               helper.appendTo((o.appendTo === "parent" ? this.element[0].parentNode : o.appendTo));
+          }
+
+          if(helper[0] !== this.element[0] && !(/(fixed|absolute)/).test(helper.css("position"))) {
+               helper.css("position", "absolute");
+          }
+
+          return helper;
+
+     },
+
+     _adjustOffsetFromHelper: function(obj) {
+          if (typeof obj === "string") {
+               obj = obj.split(" ");
+          }
+          if ($.isArray(obj)) {
+               obj = {left: +obj[0], top: +obj[1] || 0};
+          }
+          if ("left" in obj) {
+               this.offset.click.left = obj.left + this.margins.left;
+          }
+          if ("right" in obj) {
+               this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+          }
+          if ("top" in obj) {
+               this.offset.click.top = obj.top + this.margins.top;
+          }
+          if ("bottom" in obj) {
+               this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+          }
+     },
+
+     _getParentOffset: function() {
+
+          //Get the offsetParent and cache its position
+          var po = this.offsetParent.offset();
+
+          // This is a special case where we need to modify a offset calculated on start, since the following happened:
+          // 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+          // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+          //    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+          if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
+               po.left += this.scrollParent.scrollLeft();
+               po.top += this.scrollParent.scrollTop();
+          }
+
+          //This needs to be actually done for all browsers, since pageX/pageY includes this information
+          //Ugly IE fix
+          if((this.offsetParent[0] === document.body) ||
+               (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
+               po = { top: 0, left: 0 };
+          }
+
+          return {
+               top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+               left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+          };
+
+     },
+
+     _getRelativeOffset: function() {
+
+          if(this.cssPosition === "relative") {
+               var p = this.element.position();
+               return {
+                    top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+                    left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+               };
+          } else {
+               return { top: 0, left: 0 };
+          }
+
+     },
+
+     _cacheMargins: function() {
+          this.margins = {
+               left: (parseInt(this.element.css("marginLeft"),10) || 0),
+               top: (parseInt(this.element.css("marginTop"),10) || 0),
+               right: (parseInt(this.element.css("marginRight"),10) || 0),
+               bottom: (parseInt(this.element.css("marginBottom"),10) || 0)
+          };
+     },
+
+     _cacheHelperProportions: function() {
+          this.helperProportions = {
+               width: this.helper.outerWidth(),
+               height: this.helper.outerHeight()
+          };
+     },
+
+     _setContainment: function() {
+
+          var over, c, ce,
+               o = this.options;
+
+          if ( !o.containment ) {
+               this.containment = null;
+               return;
+          }
+
+          if ( o.containment === "window" ) {
+               this.containment = [
+                    $( window ).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
+                    $( window ).scrollTop() - this.offset.relative.top - this.offset.parent.top,
+                    $( window ).scrollLeft() + $( window ).width() - this.helperProportions.width - this.margins.left,
+                    $( window ).scrollTop() + ( $( window ).height() || document.body.parentNode.scrollHeight ) - this.helperProportions.height - this.margins.top
+               ];
+               return;
+          }
+
+          if ( o.containment === "document") {
+               this.containment = [
+                    0,
+                    0,
+                    $( document ).width() - this.helperProportions.width - this.margins.left,
+                    ( $( document ).height() || document.body.parentNode.scrollHeight ) - this.helperProportions.height - this.margins.top
+               ];
+               return;
+          }
+
+          if ( o.containment.constructor === Array ) {
+               this.containment = o.containment;
+               return;
+          }
+
+          if ( o.containment === "parent" ) {
+               o.containment = this.helper[ 0 ].parentNode;
+          }
+
+          c = $( o.containment );
+          ce = c[ 0 ];
+
+          if( !ce ) {
+               return;
+          }
+
+          over = c.css( "overflow" ) !== "hidden";
+
+          this.containment = [
+               ( parseInt( c.css( "borderLeftWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingLeft" ), 10 ) || 0 ),
+               ( parseInt( c.css( "borderTopWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingTop" ), 10 ) || 0 ) ,
+               ( over ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) - ( parseInt( c.css( "borderRightWidth" ), 10 ) || 0 ) - ( parseInt( c.css( "paddingRight" ), 10 ) || 0 ) - this.helperProportions.width - this.margins.left - this.margins.right,
+               ( over ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) - ( parseInt( c.css( "borderBottomWidth" ), 10 ) || 0 ) - ( parseInt( c.css( "paddingBottom" ), 10 ) || 0 ) - this.helperProportions.height - this.margins.top  - this.margins.bottom
+          ];
+          this.relative_container = c;
+     },
+
+     _convertPositionTo: function(d, pos) {
+
+          if(!pos) {
+               pos = this.position;
+          }
+
+          var mod = d === "absolute" ? 1 : -1,
+               scroll = this.cssPosition === "absolute" && !( this.scrollParent[ 0 ] !== document && $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ? this.offsetParent : this.scrollParent;
+
+          //Cache the scroll
+          if (!this.offset.scroll) {
+               this.offset.scroll = {top : scroll.scrollTop(), left : scroll.scrollLeft()};
+          }
+
+          return {
+               top: (
+                    pos.top   +                                                                               // The absolute mouse position
+                    this.offset.relative.top * mod +                                                // Only for relative positioned nodes: Relative offset from element to offset parent
+                    this.offset.parent.top * mod -                                                  // The offsetParent's offset without borders (offset + border)
+                    ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : this.offset.scroll.top ) * mod )
+               ),
+               left: (
+                    pos.left +                                                                                // The absolute mouse position
+                    this.offset.relative.left * mod +                                               // Only for relative positioned nodes: Relative offset from element to offset parent
+                    this.offset.parent.left * mod -                                                 // The offsetParent's offset without borders (offset + border)
+                    ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : this.offset.scroll.left ) * mod )
+               )
+          };
+
+     },
+
+     _generatePosition: function(event) {
+
+          var containment, co, top, left,
+               o = this.options,
+               scroll = this.cssPosition === "absolute" && !( this.scrollParent[ 0 ] !== document && $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ? this.offsetParent : this.scrollParent,
+               pageX = event.pageX,
+               pageY = event.pageY;
+
+          //Cache the scroll
+          if (!this.offset.scroll) {
+               this.offset.scroll = {top : scroll.scrollTop(), left : scroll.scrollLeft()};
+          }
+
+          /*
+           * - Position constraining -
+           * Constrain the position to a mix of grid, containment.
+           */
+
+          // If we are not dragging yet, we won't check for options
+          if ( this.originalPosition ) {
+               if ( this.containment ) {
+                    if ( this.relative_container ){
+                         co = this.relative_container.offset();
+                         containment = [
+                              this.containment[ 0 ] + co.left,
+                              this.containment[ 1 ] + co.top,
+                              this.containment[ 2 ] + co.left,
+                              this.containment[ 3 ] + co.top
+                         ];
+                    }
+                    else {
+                         containment = this.containment;
+                    }
+
+                    if(event.pageX - this.offset.click.left < containment[0]) {
+                         pageX = containment[0] + this.offset.click.left;
+                    }
+                    if(event.pageY - this.offset.click.top < containment[1]) {
+                         pageY = containment[1] + this.offset.click.top;
+                    }
+                    if(event.pageX - this.offset.click.left > containment[2]) {
+                         pageX = containment[2] + this.offset.click.left;
+                    }
+                    if(event.pageY - this.offset.click.top > containment[3]) {
+                         pageY = containment[3] + this.offset.click.top;
+                    }
+               }
+
+               if(o.grid) {
+                    //Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950)
+                    top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY;
+                    pageY = containment ? ((top - this.offset.click.top >= containment[1] || top - this.offset.click.top > containment[3]) ? top : ((top - this.offset.click.top >= containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+                    left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX;
+                    pageX = containment ? ((left - this.offset.click.left >= containment[0] || left - this.offset.click.left > containment[2]) ? left : ((left - this.offset.click.left >= containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+               }
+
+          }
+
+          return {
+               top: (
+                    pageY -                                                                                   // The absolute mouse position
+                    this.offset.click.top    -                                                           // Click offset (relative to the element)
+                    this.offset.relative.top -                                                           // Only for relative positioned nodes: Relative offset from element to offset parent
+                    this.offset.parent.top +                                                        // The offsetParent's offset without borders (offset + border)
+                    ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : this.offset.scroll.top )
+               ),
+               left: (
+                    pageX -                                                                                   // The absolute mouse position
+                    this.offset.click.left -                                                        // Click offset (relative to the element)
+                    this.offset.relative.left -                                                          // Only for relative positioned nodes: Relative offset from element to offset parent
+                    this.offset.parent.left +                                                            // The offsetParent's offset without borders (offset + border)
+                    ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : this.offset.scroll.left )
+               )
+          };
+
+     },
+
+     _clear: function() {
+          this.helper.removeClass("ui-draggable-dragging");
+          if(this.helper[0] !== this.element[0] && !this.cancelHelperRemoval) {
+               this.helper.remove();
+          }
+          this.helper = null;
+          this.cancelHelperRemoval = false;
+     },
+
+     // From now on bulk stuff - mainly helpers
+
+     _trigger: function(type, event, ui) {
+          ui = ui || this._uiHash();
+          $.ui.plugin.call(this, type, [event, ui]);
+          //The absolute position has to be recalculated after plugins
+          if(type === "drag") {
+               this.positionAbs = this._convertPositionTo("absolute");
+          }
+          return $.Widget.prototype._trigger.call(this, type, event, ui);
+     },
+
+     plugins: {},
+
+     _uiHash: function() {
+          return {
+               helper: this.helper,
+               position: this.position,
+               originalPosition: this.originalPosition,
+               offset: this.positionAbs
+          };
+     }
+
+});
+
+$.ui.plugin.add("draggable", "connectToSortable", {
+     start: function(event, ui) {
+
+          var inst = $(this).data("ui-draggable"), o = inst.options,
+               uiSortable = $.extend({}, ui, { item: inst.element });
+          inst.sortables = [];
+          $(o.connectToSortable).each(function() {
+               var sortable = $.data(this, "ui-sortable");
+               if (sortable && !sortable.options.disabled) {
+                    inst.sortables.push({
+                         instance: sortable,
+                         shouldRevert: sortable.options.revert
+                    });
+                    sortable.refreshPositions();  // Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page).
+                    sortable._trigger("activate", event, uiSortable);
+               }
+          });
+
+     },
+     stop: function(event, ui) {
+
+          //If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
+          var inst = $(this).data("ui-draggable"),
+               uiSortable = $.extend({}, ui, { item: inst.element });
+
+          $.each(inst.sortables, function() {
+               if(this.instance.isOver) {
+
+                    this.instance.isOver = 0;
+
+                    inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
+                    this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
+
+                    //The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: "valid/invalid"
+                    if(this.shouldRevert) {
+                         this.instance.options.revert = this.shouldRevert;
+                    }
+
+                    //Trigger the stop of the sortable
+                    this.instance._mouseStop(event);
+
+                    this.instance.options.helper = this.instance.options._helper;
+
+                    //If the helper has been the original item, restore properties in the sortable
+                    if(inst.options.helper === "original") {
+                         this.instance.currentItem.css({ top: "auto", left: "auto" });
+                    }
+
+               } else {
+                    this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
+                    this.instance._trigger("deactivate", event, uiSortable);
+               }
+
+          });
+
+     },
+     drag: function(event, ui) {
+
+          var inst = $(this).data("ui-draggable"), that = this;
+
+          $.each(inst.sortables, function() {
+
+               var innermostIntersecting = false,
+                    thisSortable = this;
+
+               //Copy over some variables to allow calling the sortable's native _intersectsWith
+               this.instance.positionAbs = inst.positionAbs;
+               this.instance.helperProportions = inst.helperProportions;
+               this.instance.offset.click = inst.offset.click;
+
+               if(this.instance._intersectsWith(this.instance.containerCache)) {
+                    innermostIntersecting = true;
+                    $.each(inst.sortables, function () {
+                         this.instance.positionAbs = inst.positionAbs;
+                         this.instance.helperProportions = inst.helperProportions;
+                         this.instance.offset.click = inst.offset.click;
+                         if (this !== thisSortable &&
+                              this.instance._intersectsWith(this.instance.containerCache) &&
+                              $.contains(thisSortable.instance.element[0], this.instance.element[0])
+                         ) {
+                              innermostIntersecting = false;
+                         }
+                         return innermostIntersecting;
+                    });
+               }
+
+
+               if(innermostIntersecting) {
+                    //If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
+                    if(!this.instance.isOver) {
+
+                         this.instance.isOver = 1;
+                         //Now we fake the start of dragging for the sortable instance,
+                         //by cloning the list group item, appending it to the sortable and using it as inst.currentItem
+                         //We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
+                         this.instance.currentItem = $(that).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item", true);
+                         this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
+                         this.instance.options.helper = function() { return ui.helper[0]; };
+
+                         event.target = this.instance.currentItem[0];
+                         this.instance._mouseCapture(event, true);
+                         this.instance._mouseStart(event, true, true);
+
+                         //Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
+                         this.instance.offset.click.top = inst.offset.click.top;
+                         this.instance.offset.click.left = inst.offset.click.left;
+                         this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
+                         this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
+
+                         inst._trigger("toSortable", event);
+                         inst.dropped = this.instance.element; //draggable revert needs that
+                         //hack so receive/update callbacks work (mostly)
+                         inst.currentItem = inst.element;
+                         this.instance.fromOutside = inst;
+
+                    }
+
+                    //Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
+                    if(this.instance.currentItem) {
+                         this.instance._mouseDrag(event);
+                    }
+
+               } else {
+
+                    //If it doesn't intersect with the sortable, and it intersected before,
+                    //we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
+                    if(this.instance.isOver) {
+
+                         this.instance.isOver = 0;
+                         this.instance.cancelHelperRemoval = true;
+
+                         //Prevent reverting on this forced stop
+                         this.instance.options.revert = false;
+
+                         // The out event needs to be triggered independently
+                         this.instance._trigger("out", event, this.instance._uiHash(this.instance));
+
+                         this.instance._mouseStop(event, true);
+                         this.instance.options.helper = this.instance.options._helper;
+
+                         //Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
+                         this.instance.currentItem.remove();
+                         if(this.instance.placeholder) {
+                              this.instance.placeholder.remove();
+                         }
+
+                         inst._trigger("fromSortable", event);
+                         inst.dropped = false; //draggable revert needs that
+                    }
+
+               }
+
+          });
+
+     }
+});
+
+$.ui.plugin.add("draggable", "cursor", {
+     start: function() {
+          var t = $("body"), o = $(this).data("ui-draggable").options;
+          if (t.css("cursor")) {
+               o._cursor = t.css("cursor");
+          }
+          t.css("cursor", o.cursor);
+     },
+     stop: function() {
+          var o = $(this).data("ui-draggable").options;
+          if (o._cursor) {
+               $("body").css("cursor", o._cursor);
+          }
+     }
+});
+
+$.ui.plugin.add("draggable", "opacity", {
+     start: function(event, ui) {
+          var t = $(ui.helper), o = $(this).data("ui-draggable").options;
+          if(t.css("opacity")) {
+               o._opacity = t.css("opacity");
+          }
+          t.css("opacity", o.opacity);
+     },
+     stop: function(event, ui) {
+          var o = $(this).data("ui-draggable").options;
+          if(o._opacity) {
+               $(ui.helper).css("opacity", o._opacity);
+          }
+     }
+});
+
+$.ui.plugin.add("draggable", "scroll", {
+     start: function() {
+          var i = $(this).data("ui-draggable");
+          if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") {
+               i.overflowOffset = i.scrollParent.offset();
+          }
+     },
+     drag: function( event ) {
+
+          var i = $(this).data("ui-draggable"), o = i.options, scrolled = false;
+
+          if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") {
+
+               if(!o.axis || o.axis !== "x") {
+                    if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
+                         i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed;
+                    } else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity) {
+                         i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop - o.scrollSpeed;
+                    }
+               }
+
+               if(!o.axis || o.axis !== "y") {
+                    if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
+                         i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed;
+                    } else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity) {
+                         i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft - o.scrollSpeed;
+                    }
+               }
+
+          } else {
+
+               if(!o.axis || o.axis !== "x") {
+                    if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
+                         scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+                    } else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
+                         scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+                    }
+               }
+
+               if(!o.axis || o.axis !== "y") {
+                    if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
+                         scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+                    } else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
+                         scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+                    }
+               }
+
+          }
+
+          if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
+               $.ui.ddmanager.prepareOffsets(i, event);
+          }
+
+     }
+});
+
+$.ui.plugin.add("draggable", "snap", {
+     start: function() {
+
+          var i = $(this).data("ui-draggable"),
+               o = i.options;
+
+          i.snapElements = [];
+
+          $(o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap).each(function() {
+               var $t = $(this),
+                    $o = $t.offset();
+               if(this !== i.element[0]) {
+                    i.snapElements.push({
+                         item: this,
+                         width: $t.outerWidth(), height: $t.outerHeight(),
+                         top: $o.top, left: $o.left
+                    });
+               }
+          });
+
+     },
+     drag: function(event, ui) {
+
+          var ts, bs, ls, rs, l, r, t, b, i, first,
+               inst = $(this).data("ui-draggable"),
+               o = inst.options,
+               d = o.snapTolerance,
+               x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
+               y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
+
+          for (i = inst.snapElements.length - 1; i >= 0; i--){
+
+               l = inst.snapElements[i].left;
+               r = l + inst.snapElements[i].width;
+               t = inst.snapElements[i].top;
+               b = t + inst.snapElements[i].height;
+
+               if ( x2 < l - d || x1 > r + d || y2 < t - d || y1 > b + d || !$.contains( inst.snapElements[ i ].item.ownerDocument, inst.snapElements[ i ].item ) ) {
+                    if(inst.snapElements[i].snapping) {
+                         (inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+                    }
+                    inst.snapElements[i].snapping = false;
+                    continue;
+               }
+
+               if(o.snapMode !== "inner") {
+                    ts = Math.abs(t - y2) <= d;
+                    bs = Math.abs(b - y1) <= d;
+                    ls = Math.abs(l - x2) <= d;
+                    rs = Math.abs(r - x1) <= d;
+                    if(ts) {
+                         ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+                    }
+                    if(bs) {
+                         ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top;
+                    }
+                    if(ls) {
+                         ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left;
+                    }
+                    if(rs) {
+                         ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left;
+                    }
+               }
+
+               first = (ts || bs || ls || rs);
+
+               if(o.snapMode !== "outer") {
+                    ts = Math.abs(t - y1) <= d;
+                    bs = Math.abs(b - y2) <= d;
+                    ls = Math.abs(l - x1) <= d;
+                    rs = Math.abs(r - x2) <= d;
+                    if(ts) {
+                         ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top;
+                    }
+                    if(bs) {
+                         ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+                    }
+                    if(ls) {
+                         ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left;
+                    }
+                    if(rs) {
+                         ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left;
+                    }
+               }
+
+               if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first)) {
+                    (inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+               }
+               inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
+
+          }
+
+     }
+});
+
+$.ui.plugin.add("draggable", "stack", {
+     start: function() {
+          var min,
+               o = this.data("ui-draggable").options,
+               group = $.makeArray($(o.stack)).sort(function(a,b) {
+                    return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
+               });
+
+          if (!group.length) { return; }
+
+          min = parseInt($(group[0]).css("zIndex"), 10) || 0;
+          $(group).each(function(i) {
+               $(this).css("zIndex", min + i);
+          });
+          this.css("zIndex", (min + group.length));
+     }
+});
+
+$.ui.plugin.add("draggable", "zIndex", {
+     start: function(event, ui) {
+          var t = $(ui.helper), o = $(this).data("ui-draggable").options;
+          if(t.css("zIndex")) {
+               o._zIndex = t.css("zIndex");
+          }
+          t.css("zIndex", o.zIndex);
+     },
+     stop: function(event, ui) {
+          var o = $(this).data("ui-draggable").options;
+          if(o._zIndex) {
+               $(ui.helper).css("zIndex", o._zIndex);
+          }
+     }
+});
+
+})(jQuery);
+(function( $, undefined ) {
+
+/*jshint loopfunc: true */
+
+function isOverAxis( x, reference, size ) {
+     return ( x > reference ) && ( x < ( reference + size ) );
+}
+
+function isFloating(item) {
+     return (/left|right/).test(item.css("float")) || (/inline|table-cell/).test(item.css("display"));
+}
+
 $.widget("ui.sortable", $.ui.mouse, {
-     version: "1.9.2",
+     version: "1.10.3",
      widgetEventPrefix: "sort",
      ready: false,
@@ -1035 +1945 @@
           connectWith: false,
           containment: false,
-          cursor: 'auto',
+          cursor: "auto",
           cursorAt: false,
           dropOnEmpty: true,
@@ -1043 +1953 @@
           handle: false,
           helper: "original",
-          items: '> *',
+          items: "> *",
           opacity: false,
           placeholder: false,
@@ -1052 +1962 @@
           scope: "default",
           tolerance: "intersect",
-          zIndex: 1000
+          zIndex: 1000,
+
+          // callbacks
+          activate: null,
+          beforeStop: null,
+          change: null,
+          deactivate: null,
+          out: null,
+          over: null,
+          receive: null,
+          remove: null,
+          sort: null,
+          start: null,
+          stop: null,
+          update: null
      },
      _create: function() {
@@ -1064 +1988 @@
 
           //Let's determine if the items are being displayed horizontally
-          this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
+          this.floating = this.items.length ? o.axis === "x" || isFloating(this.items[0].item) : false;
 
           //Let's determine the parent's offset
@@ -1073 +1997 @@
 
           //We're ready to go
-          this.ready = true
+          this.ready = true;
 
      },
@@ -1082 +2006 @@
           this._mouseDestroy();
 
-          for ( var i = this.items.length - 1; i >= 0; i-- )
+          for ( var i = this.items.length - 1; i >= 0; i-- ) {
                this.items[i].item.removeData(this.widgetName + "-item");
+          }
 
           return this;
@@ -1100 +2025 @@
 
      _mouseCapture: function(event, overrideHandle) {
-          var that = this;
+          var currentItem = null,
+               validHandle = false,
+               that = this;
 
           if (this.reverting) {
@@ -1106 +2033 @@
           }
 
-          if(this.options.disabled || this.options.type == 'static') return false;
+          if(this.options.disabled || this.options.type === "static") {
+               return false;
+          }
 
           //We have to refresh the items data once first
@@ -1112 +2041 @@
 
           //Find out if the clicked node (or one of its parents) is a actual item in this.items
-          var currentItem = null, nodes = $(event.target).parents().each(function() {
-               if($.data(this, that.widgetName + '-item') == that) {
+          $(event.target).parents().each(function() {
+               if($.data(this, that.widgetName + "-item") === that) {
                     currentItem = $(this);
                     return false;
                }
           });
-          if($.data(event.target, that.widgetName + '-item') == that) currentItem = $(event.target);
-
-          if(!currentItem) return false;
+          if($.data(event.target, that.widgetName + "-item") === that) {
+               currentItem = $(event.target);
+          }
+
+          if(!currentItem) {
+               return false;
+          }
           if(this.options.handle && !overrideHandle) {
-               var validHandle = false;
-
-               $(this.options.handle, currentItem).find("*").andSelf().each(function() { if(this == event.target) validHandle = true; });
-               if(!validHandle) return false;
+               $(this.options.handle, currentItem).find("*").addBack().each(function() {
+                    if(this === event.target) {
+                         validHandle = true;
+                    }
+               });
+               if(!validHandle) {
+                    return false;
+               }
           }
 
@@ -1136 +2073 @@
      _mouseStart: function(event, overrideHandle, noActivation) {
 
-          var o = this.options;
+          var i, body,
+               o = this.options;
+
           this.currentContainer = this;
 
@@ -1185 +2124 @@
           this.originalPageY = event.pageY;
 
-          //Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
+          //Adjust the mouse offset relative to the helper if "cursorAt" is supplied
           (o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
 
@@ -1192 +2131 @@
 
           //If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
-          if(this.helper[0] != this.currentItem[0]) {
+          if(this.helper[0] !== this.currentItem[0]) {
                this.currentItem.hide();
           }
@@ -1200 +2139 @@
 
           //Set a containment if given in the options
-          if(o.containment)
+          if(o.containment) {
                this._setContainment();
-
-          if(o.cursor) { // cursor option
-               if ($('body').css("cursor")) this._storedCursor = $('body').css("cursor");
-               $('body').css("cursor", o.cursor);
+          }
+
+          if( o.cursor && o.cursor !== "auto" ) { // cursor option
+               body = this.document.find( "body" );
+
+               // support: IE
+               this.storedCursor = body.css( "cursor" );
+               body.css( "cursor", o.cursor );
+
+               this.storedStylesheet = $( "<style>*{ cursor: "+o.cursor+" !important; }</style>" ).appendTo( body );
           }
 
           if(o.opacity) { // opacity option
-               if (this.helper.css("opacity")) this._storedOpacity = this.helper.css("opacity");
+               if (this.helper.css("opacity")) {
+                    this._storedOpacity = this.helper.css("opacity");
+               }
                this.helper.css("opacity", o.opacity);
           }
 
           if(o.zIndex) { // zIndex option
-               if (this.helper.css("zIndex")) this._storedZIndex = this.helper.css("zIndex");
+               if (this.helper.css("zIndex")) {
+                    this._storedZIndex = this.helper.css("zIndex");
+               }
                this.helper.css("zIndex", o.zIndex);
           }
 
           //Prepare scrolling
-          if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML')
+          if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
                this.overflowOffset = this.scrollParent.offset();
+          }
 
           //Call callbacks
@@ -1226 +2176 @@
 
           //Recache the helper size
-          if(!this._preserveHelperProportions)
+          if(!this._preserveHelperProportions) {
                this._cacheHelperProportions();
-
-
-          //Post 'activate' events to possible containers
-          if(!noActivation) {
-                for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i]._trigger("activate", event, this._uiHash(this)); }
+          }
+
+
+          //Post "activate" events to possible containers
+          if( !noActivation ) {
+               for ( i = this.containers.length - 1; i >= 0; i-- ) {
+                    this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
+               }
           }
 
           //Prepare possible droppables
-          if($.ui.ddmanager)
+          if($.ui.ddmanager) {
                $.ui.ddmanager.current = this;
-
-          if ($.ui.ddmanager && !o.dropBehaviour)
+          }
+
+          if ($.ui.ddmanager && !o.dropBehaviour) {
                $.ui.ddmanager.prepareOffsets(this, event);
+          }
 
           this.dragging = true;
@@ -1251 +2206 @@
 
      _mouseDrag: function(event) {
+          var i, item, itemElement, intersection,
+               o = this.options,
+               scrolled = false;
 
           //Compute the helpers position
@@ -1262 +2220 @@
           //Do scrolling
           if(this.options.scroll) {
-               var o = this.options, scrolled = false;
-               if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
-
-                    if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
+               if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
+
+                    if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
                          this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
-                    else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity)
+                    } else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity) {
                          this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
-
-                    if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
+                    }
+
+                    if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
                          this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
-                    else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity)
+                    } else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity) {
                          this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+                    }
 
                } else {
 
-                    if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
+                    if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
                          scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-                    else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
+                    } else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
                          scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
-
-                    if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
+                    }
+
+                    if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
                          scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-                    else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
+                    } else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
                          scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
-
-               }
-
-               if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
+                    }
+
+               }
+
+               if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
                     $.ui.ddmanager.prepareOffsets(this, event);
+               }
           }
 
@@ -1297 +2259 @@
 
           //Set the helper position
-          if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
-          if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
+          if(!this.options.axis || this.options.axis !== "y") {
+               this.helper[0].style.left = this.position.left+"px";
+          }
+          if(!this.options.axis || this.options.axis !== "x") {
+               this.helper[0].style.top = this.position.top+"px";
+          }
 
           //Rearrange
-          for (var i = this.items.length - 1; i >= 0; i--) {
+          for (i = this.items.length - 1; i >= 0; i--) {
 
                //Cache variables and intersection, continue if no intersection
-               var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
-               if (!intersection) continue;
+               item = this.items[i];
+               itemElement = item.item[0];
+               intersection = this._intersectsWithPointer(item);
+               if (!intersection) {
+                    continue;
+               }
 
                // Only put the placeholder inside the current Container, skip all
@@ -1314 +2284 @@
                // Without this moving items in "sub-sortables" can cause the placeholder to jitter
                // beetween the outer and inner container.
-               if (item.instance !== this.currentContainer) continue;
-
-               if (itemElement != this.currentItem[0] //cannot intersect with itself
-                    &&   this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
-                    &&   !$.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
-                    && (this.options.type == 'semi-dynamic' ? !$.contains(this.element[0], itemElement) : true)
-                    //&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
+               if (item.instance !== this.currentContainer) {
+                    continue;
+               }
+
+               // cannot intersect with itself
+               // no useless actions that have been done before
+               // no action if the item moved is the parent of the item checked
+               if (itemElement !== this.currentItem[0] &&
+                    this.placeholder[intersection === 1 ? "next" : "prev"]()[0] !== itemElement &&
+                    !$.contains(this.placeholder[0], itemElement) &&
+                    (this.options.type === "semi-dynamic" ? !$.contains(this.element[0], itemElement) : true)
                ) {
 
-                    this.direction = intersection == 1 ? "down" : "up";
-
-                    if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
+                    this.direction = intersection === 1 ? "down" : "up";
+
+                    if (this.options.tolerance === "pointer" || this._intersectsWithSides(item)) {
                          this._rearrange(event, item);
                     } else {
@@ -1340 +2314 @@
 
           //Interconnect with droppables
-          if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
+          if($.ui.ddmanager) {
+               $.ui.ddmanager.drag(this, event);
+          }
 
           //Call callbacks
-          this._trigger('sort', event, this._uiHash());
+          this._trigger("sort", event, this._uiHash());
 
           this.lastPositionAbs = this.positionAbs;
@@ -1352 +2328 @@
      _mouseStop: function(event, noPropagation) {
 
-          if(!event) return;
+          if(!event) {
+               return;
+          }
 
           //If we are using droppables, inform the manager about the drop
-          if ($.ui.ddmanager && !this.options.dropBehaviour)
+          if ($.ui.ddmanager && !this.options.dropBehaviour) {
                $.ui.ddmanager.drop(this, event);
+          }
 
           if(this.options.revert) {
-               var that = this;
-               var cur = this.placeholder.offset();
-
+               var that = this,
+                    cur = this.placeholder.offset(),
+                    axis = this.options.axis,
+                    animation = {};
+
+               if ( !axis || axis === "x" ) {
+                    animation.left = cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollLeft);
+               }
+               if ( !axis || axis === "y" ) {
+                    animation.top = cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollTop);
+               }
                this.reverting = true;
-
-               $(this.helper).animate({
-                    left: cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
-                    top: cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
-               }, parseInt(this.options.revert, 10) || 500, function() {
+               $(this.helper).animate( animation, parseInt(this.options.revert, 10) || 500, function() {
                     that._clear(event);
                });
@@ -1384 +2367 @@
                this._mouseUp({ target: null });
 
-               if(this.options.helper == "original")
+               if(this.options.helper === "original") {
                     this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
-               else
+               } else {
                     this.currentItem.show();
+               }
 
                //Post deactivating events to containers
@@ -1402 +2386 @@
           if (this.placeholder) {
                //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-               if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-               if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
+               if(this.placeholder[0].parentNode) {
+                    this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+               }
+               if(this.options.helper !== "original" && this.helper && this.helper[0].parentNode) {
+                    this.helper.remove();
+               }
 
                $.extend(this, {
@@ -1425 +2413 @@
      serialize: function(o) {
 
-          var items = this._getItemsAsjQuery(o && o.connected);
-          var str = []; o = o || {};
+          var items = this._getItemsAsjQuery(o && o.connected),
+               str = [];
+          o = o || {};
 
           $(items).each(function() {
-               var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-               if(res) str.push((o.key || res[1]+'[]')+'='+(o.key && o.expression ? res[1] : res[2]));
+               var res = ($(o.item || this).attr(o.attribute || "id") || "").match(o.expression || (/(.+)[\-=_](.+)/));
+               if (res) {
+                    str.push((o.key || res[1]+"[]")+"="+(o.key && o.expression ? res[1] : res[2]));
+               }
           });
 
           if(!str.length && o.key) {
-               str.push(o.key + '=');
-          }
-
-          return str.join('&');
+               str.push(o.key + "=");
+          }
+
+          return str.join("&");
 
      },
@@ -1443 +2434 @@
      toArray: function(o) {
 
-          var items = this._getItemsAsjQuery(o && o.connected);
-          var ret = []; o = o || {};
-
-          items.each(function() { ret.push($(o.item || this).attr(o.attribute || 'id') || ''); });
+          var items = this._getItemsAsjQuery(o && o.connected),
+               ret = [];
+
+          o = o || {};
+
+          items.each(function() { ret.push($(o.item || this).attr(o.attribute || "id") || ""); });
           return ret;
 
@@ -1457 +2450 @@
                x2 = x1 + this.helperProportions.width,
                y1 = this.positionAbs.top,
-               y2 = y1 + this.helperProportions.height;
-
-          var l = item.left,
+               y2 = y1 + this.helperProportions.height,
+               l = item.left,
                r = l + item.width,
                t = item.top,
-               b = t + item.height;
-
-          var dyClick = this.offset.click.top,
-               dxClick = this.offset.click.left;
-
-          var isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r;
-
-          if(     this.options.tolerance == "pointer"
-               || this.options.forcePointerForContainers
-               || (this.options.tolerance != "pointer" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])
+               b = t + item.height,
+               dyClick = this.offset.click.top,
+               dxClick = this.offset.click.left,
+               isOverElementHeight = ( this.options.axis === "x" ) || ( ( y1 + dyClick ) > t && ( y1 + dyClick ) < b ),
+               isOverElementWidth = ( this.options.axis === "y" ) || ( ( x1 + dxClick ) > l && ( x1 + dxClick ) < r ),
+               isOverElement = isOverElementHeight && isOverElementWidth;
+
+          if ( this.options.tolerance === "pointer" ||
+               this.options.forcePointerForContainers ||
+               (this.options.tolerance !== "pointer" && this.helperProportions[this.floating ? "width" : "height"] > item[this.floating ? "width" : "height"])
           ) {
                return isOverElement;
           } else {
 
-               return (l < x1 + (this.helperProportions.width / 2) // Right Half
-                    && x2 - (this.helperProportions.width / 2) < r // Left Half
-                    && t < y1 + (this.helperProportions.height / 2) // Bottom Half
-                    && y2 - (this.helperProportions.height / 2) < b ); // Top Half
+               return (l < x1 + (this.helperProportions.width / 2) && // Right Half
+                    x2 - (this.helperProportions.width / 2) < r && // Left Half
+                    t < y1 + (this.helperProportions.height / 2) && // Bottom Half
+                    y2 - (this.helperProportions.height / 2) < b ); // Top Half
 
           }
@@ -1486 +2478 @@
      _intersectsWithPointer: function(item) {
 
-          var isOverElementHeight = (this.options.axis === 'x') || $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
-               isOverElementWidth = (this.options.axis === 'y') || $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
+          var isOverElementHeight = (this.options.axis === "x") || isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
+               isOverElementWidth = (this.options.axis === "y") || isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
                isOverElement = isOverElementHeight && isOverElementWidth,
                verticalDirection = this._getDragVerticalDirection(),
                horizontalDirection = this._getDragHorizontalDirection();
 
-          if (!isOverElement)
+          if (!isOverElement) {
                return false;
+          }
 
           return this.floating ?
-               ( ((horizontalDirection && horizontalDirection == "right") || verticalDirection == "down") ? 2 : 1 )
-               : ( verticalDirection && (verticalDirection == "down" ? 2 : 1) );
+               ( ((horizontalDirection && horizontalDirection === "right") || verticalDirection === "down") ? 2 : 1 )
+               : ( verticalDirection && (verticalDirection === "down" ? 2 : 1) );
 
      },
@@ -1503 +2496 @@
      _intersectsWithSides: function(item) {
 
-          var isOverBottomHalf = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
-               isOverRightHalf = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
+          var isOverBottomHalf = isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
+               isOverRightHalf = isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
                verticalDirection = this._getDragVerticalDirection(),
                horizontalDirection = this._getDragHorizontalDirection();
 
           if (this.floating && horizontalDirection) {
-               return ((horizontalDirection == "right" && isOverRightHalf) || (horizontalDirection == "left" && !isOverRightHalf));
+               return ((horizontalDirection === "right" && isOverRightHalf) || (horizontalDirection === "left" && !isOverRightHalf));
           } else {
-               return verticalDirection && ((verticalDirection == "down" && isOverBottomHalf) || (verticalDirection == "up" && !isOverBottomHalf));
+               return verticalDirection && ((verticalDirection === "down" && isOverBottomHalf) || (verticalDirection === "up" && !isOverBottomHalf));
           }
 
@@ -1518 +2511 @@
      _getDragVerticalDirection: function() {
           var delta = this.positionAbs.top - this.lastPositionAbs.top;
-          return delta != 0 && (delta > 0 ? "down" : "up");
+          return delta !== 0 && (delta > 0 ? "down" : "up");
      },
 
      _getDragHorizontalDirection: function() {
           var delta = this.positionAbs.left - this.lastPositionAbs.left;
-          return delta != 0 && (delta > 0 ? "right" : "left");
+          return delta !== 0 && (delta > 0 ? "right" : "left");
      },
 
@@ -1534 +2527 @@
      _connectWith: function() {
           var options = this.options;
-          return options.connectWith.constructor == String
-               ? [options.connectWith]
-               : options.connectWith;
+          return options.connectWith.constructor === String ? [options.connectWith] : options.connectWith;
      },
 
      _getItemsAsjQuery: function(connected) {
 
-          var items = [];
-          var queries = [];
-          var connectWith = this._connectWith();
+          var i, j, cur, inst,
+               items = [],
+               queries = [],
+               connectWith = this._connectWith();
 
           if(connectWith && connected) {
-               for (var i = connectWith.length - 1; i >= 0; i--){
-                    var cur = $(connectWith[i]);
-                    for (var j = cur.length - 1; j >= 0; j--){
-                         var inst = $.data(cur[j], this.widgetName);
-                         if(inst && inst != this && !inst.options.disabled) {
-                              queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]);
+               for (i = connectWith.length - 1; i >= 0; i--){
+                    cur = $(connectWith[i]);
+                    for ( j = cur.length - 1; j >= 0; j--){
+                         inst = $.data(cur[j], this.widgetFullName);
+                         if(inst && inst !== this && !inst.options.disabled) {
+                              queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), inst]);
                          }
-                    };
-               };
-          }
-
-          queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), this]);
-
-          for (var i = queries.length - 1; i >= 0; i--){
+                    }
+               }
+          }
+
+          queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), this]);
+
+          for (i = queries.length - 1; i >= 0; i--){
                queries[i][0].each(function() {
                     items.push(this);
                });
-          };
+          }
 
           return $(items);
@@ -1575 +2567 @@
           this.items = $.grep(this.items, function (item) {
                for (var j=0; j < list.length; j++) {
-                    if(list[j] == item.item[0])
+                    if(list[j] === item.item[0]) {
                          return false;
-               };
+                    }
+               }
                return true;
           });
@@ -1587 +2580 @@
           this.items = [];
           this.containers = [this];
-          var items = this.items;
-          var queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]];
-          var connectWith = this._connectWith();
+
+          var i, j, cur, inst, targetData, _queries, item, queriesLength,
+               items = this.items,
+               queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]],
+               connectWith = this._connectWith();
 
           if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
-               for (var i = connectWith.length - 1; i >= 0; i--){
-                    var cur = $(connectWith[i]);
-                    for (var j = cur.length - 1; j >= 0; j--){
-                         var inst = $.data(cur[j], this.widgetName);
-                         if(inst && inst != this && !inst.options.disabled) {
+               for (i = connectWith.length - 1; i >= 0; i--){
+                    cur = $(connectWith[i]);
+                    for (j = cur.length - 1; j >= 0; j--){
+                         inst = $.data(cur[j], this.widgetFullName);
+                         if(inst && inst !== this && !inst.options.disabled) {
                               queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
                               this.containers.push(inst);
                          }
-                    };
-               };
-          }
-
-          for (var i = queries.length - 1; i >= 0; i--) {
-               var targetData = queries[i][1];
-               var _queries = queries[i][0];
-
-               for (var j=0, queriesLength = _queries.length; j < queriesLength; j++) {
-                    var item = $(_queries[j]);
-
-                    item.data(this.widgetName + '-item', targetData); // Data for target checking (mouse manager)
+                    }
+               }
+          }
+
+          for (i = queries.length - 1; i >= 0; i--) {
+               targetData = queries[i][1];
+               _queries = queries[i][0];
+
+               for (j=0, queriesLength = _queries.length; j < queriesLength; j++) {
+                    item = $(_queries[j]);
+
+                    item.data(this.widgetName + "-item", targetData); // Data for target checking (mouse manager)
 
                     items.push({
@@ -1619 +2614 @@
                          left: 0, top: 0
                     });
-               };
-          };
+               }
+          }
 
      },
@@ -1631 +2626 @@
           }
 
-          for (var i = this.items.length - 1; i >= 0; i--){
-               var item = this.items[i];
+          var i, item, t, p;
+
+          for (i = this.items.length - 1; i >= 0; i--){
+               item = this.items[i];
 
                //We ignore calculating positions of all connected containers when we're not over them
-               if(item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0])
+               if(item.instance !== this.currentContainer && this.currentContainer && item.item[0] !== this.currentItem[0]) {
                     continue;
-
-               var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
+               }
+
+               t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
 
                if (!fast) {
@@ -1645 +2643 @@
                }
 
-               var p = t.offset();
+               p = t.offset();
                item.left = p.left;
                item.top = p.top;
-          };
+          }
 
           if(this.options.custom && this.options.custom.refreshContainers) {
                this.options.custom.refreshContainers.call(this);
           } else {
-               for (var i = this.containers.length - 1; i >= 0; i--){
-                    var p = this.containers[i].element.offset();
+               for (i = this.containers.length - 1; i >= 0; i--){
+                    p = this.containers[i].element.offset();
                     this.containers[i].containerCache.left = p.left;
                     this.containers[i].containerCache.top = p.top;
                     this.containers[i].containerCache.width = this.containers[i].element.outerWidth();
                     this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
-               };
+               }
           }
 
@@ -1667 +2665 @@
      _createPlaceholder: function(that) {
           that = that || this;
-          var o = that.options;
-
-          if(!o.placeholder || o.placeholder.constructor == String) {
-               var className = o.placeholder;
+          var className,
+               o = that.options;
+
+          if(!o.placeholder || o.placeholder.constructor === String) {
+               className = o.placeholder;
                o.placeholder = {
                     element: function() {
 
-                         var el = $(document.createElement(that.currentItem[0].nodeName))
-                              .addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
-                              .removeClass("ui-sortable-helper")[0];
-
-                         if(!className)
-                              el.style.visibility = "hidden";
-
-                         return el;
+                         var nodeName = that.currentItem[0].nodeName.toLowerCase(),
+                              element = $( "<" + nodeName + ">", that.document[0] )
+                                   .addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
+                                   .removeClass("ui-sortable-helper");
+
+                         if ( nodeName === "tr" ) {
+                              that.currentItem.children().each(function() {
+                                   $( "<td>&#160;</td>", that.document[0] )
+                                        .attr( "colspan", $( this ).attr( "colspan" ) || 1 )
+                                        .appendTo( element );
+                              });
+                         } else if ( nodeName === "img" ) {
+                              element.attr( "src", that.currentItem.attr( "src" ) );
+                         }
+
+                         if ( !className ) {
+                              element.css( "visibility", "hidden" );
+                         }
+
+                         return element;
                     },
                     update: function(container, p) {
@@ -1687 +2698 @@
                          // 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
                          // 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
-                         if(className && !o.forcePlaceholderSize) return;
+                         if(className && !o.forcePlaceholderSize) {
+                              return;
+                         }
 
                          //If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
-                         if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css('paddingTop')||0, 10) - parseInt(that.currentItem.css('paddingBottom')||0, 10)); };
-                         if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css('paddingLeft')||0, 10) - parseInt(that.currentItem.css('paddingRight')||0, 10)); };
+                         if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css("paddingTop")||0, 10) - parseInt(that.currentItem.css("paddingBottom")||0, 10)); }
+                         if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css("paddingLeft")||0, 10) - parseInt(that.currentItem.css("paddingRight")||0, 10)); }
                     }
                };
@@ -1708 +2721 @@
 
      _contactContainers: function(event) {
+          var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, base, cur, nearBottom, floating,
+               innermostContainer = null,
+               innermostIndex = null;
 
           // get innermost container that intersects with item
-          var innermostContainer = null, innermostIndex = null;
-
-
-          for (var i = this.containers.length - 1; i >= 0; i--){
+          for (i = this.containers.length - 1; i >= 0; i--) {
 
                // never consider a container that's located within the item itself
-               if($.contains(this.currentItem[0], this.containers[i].element[0]))
+               if($.contains(this.currentItem[0], this.containers[i].element[0])) {
                     continue;
+               }
 
                if(this._intersectsWith(this.containers[i].containerCache)) {
 
                     // if we've already found a container and it's more "inner" than this, then continue
-                    if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0]))
+                    if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0])) {
                          continue;
+                    }
 
                     innermostContainer = this.containers[i];
@@ -1739 +2754 @@
 
           // if no intersecting containers found, return
-          if(!innermostContainer) return;
+          if(!innermostContainer) {
+               return;
+          }
 
           // move the item into the container if it's not there already
           if(this.containers.length === 1) {
-               this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
-               this.containers[innermostIndex].containerCache.over = 1;
+               if (!this.containers[innermostIndex].containerCache.over) {
+                    this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+                    this.containers[innermostIndex].containerCache.over = 1;
+               }
           } else {
 
                //When entering a new container, we will find the item with the least distance and append our item near it
-               var dist = 10000; var itemWithLeastDistance = null;
-               var posProperty = this.containers[innermostIndex].floating ? 'left' : 'top';
-               var sizeProperty = this.containers[innermostIndex].floating ? 'width' : 'height';
-               var base = this.positionAbs[posProperty] + this.offset.click[posProperty];
-               for (var j = this.items.length - 1; j >= 0; j--) {
-                    if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) continue;
-                    if(this.items[j].item[0] == this.currentItem[0]) continue;
-                    var cur = this.items[j].item.offset()[posProperty];
-                    var nearBottom = false;
+               dist = 10000;
+               itemWithLeastDistance = null;
+               floating = innermostContainer.floating || isFloating(this.currentItem);
+               posProperty = floating ? "left" : "top";
+               sizeProperty = floating ? "width" : "height";
+               base = this.positionAbs[posProperty] + this.offset.click[posProperty];
+               for (j = this.items.length - 1; j >= 0; j--) {
+                    if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) {
+                         continue;
+                    }
+                    if(this.items[j].item[0] === this.currentItem[0]) {
+                         continue;
+                    }
+                    if (floating && !isOverAxis(this.positionAbs.top + this.offset.click.top, this.items[j].top, this.items[j].height)) {
+                         continue;
+                    }
+                    cur = this.items[j].item.offset()[posProperty];
+                    nearBottom = false;
                     if(Math.abs(cur - base) > Math.abs(cur + this.items[j][sizeProperty] - base)){
                          nearBottom = true;
@@ -1768 +2796 @@
                }
 
-               if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled
+               //Check if dropOnEmpty is enabled
+               if(!itemWithLeastDistance && !this.options.dropOnEmpty) {
                     return;
-
-               this.currentContainer = this.containers[innermostIndex];
+               }
+
+               if(this.currentContainer === this.containers[innermostIndex]) {
+                    return;
+               }
+
                itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
                this._trigger("change", event, this._uiHash());
                this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
+               this.currentContainer = this.containers[innermostIndex];
 
                //Update the placeholder
@@ -1788 +2822 @@
      _createHelper: function(event) {
 
-          var o = this.options;
-          var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper == 'clone' ? this.currentItem.clone() : this.currentItem);
-
-          if(!helper.parents('body').length) //Add the helper to the DOM if that didn't happen already
-               $(o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
-
-          if(helper[0] == this.currentItem[0])
+          var o = this.options,
+               helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper === "clone" ? this.currentItem.clone() : this.currentItem);
+
+          //Add the helper to the DOM if that didn't happen already
+          if(!helper.parents("body").length) {
+               $(o.appendTo !== "parent" ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
+          }
+
+          if(helper[0] === this.currentItem[0]) {
                this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
-
-          if(helper[0].style.width == '' || o.forceHelperSize) helper.width(this.currentItem.width());
-          if(helper[0].style.height == '' || o.forceHelperSize) helper.height(this.currentItem.height());
+          }
+
+          if(!helper[0].style.width || o.forceHelperSize) {
+               helper.width(this.currentItem.width());
+          }
+          if(!helper[0].style.height || o.forceHelperSize) {
+               helper.height(this.currentItem.height());
+          }
 
           return helper;
@@ -1805 +2846 @@
 
      _adjustOffsetFromHelper: function(obj) {
-          if (typeof obj == 'string') {
-               obj = obj.split(' ');
+          if (typeof obj === "string") {
+               obj = obj.split(" ");
           }
           if ($.isArray(obj)) {
                obj = {left: +obj[0], top: +obj[1] || 0};
           }
-          if ('left' in obj) {
+          if ("left" in obj) {
                this.offset.click.left = obj.left + this.margins.left;
           }
-          if ('right' in obj) {
+          if ("right" in obj) {
                this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
           }
-          if ('top' in obj) {
+          if ("top" in obj) {
                this.offset.click.top = obj.top + this.margins.top;
           }
-          if ('bottom' in obj) {
+          if ("bottom" in obj) {
                this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
           }
@@ -1836 +2877 @@
           // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
           //    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-          if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
+          if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
                po.left += this.scrollParent.scrollLeft();
                po.top += this.scrollParent.scrollTop();
           }
 
-          if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
-          || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.ui.ie)) //Ugly IE fix
+          // This needs to be actually done for all browsers, since pageX/pageY includes this information
+          // with an ugly IE fix
+          if( this.offsetParent[0] === document.body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
                po = { top: 0, left: 0 };
+          }
 
           return {
@@ -1854 +2897 @@
      _getRelativeOffset: function() {
 
-          if(this.cssPosition == "relative") {
+          if(this.cssPosition === "relative") {
                var p = this.currentItem.position();
                return {
@@ -1882 +2925 @@
      _setContainment: function() {
 
-          var o = this.options;
-          if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
-          if(o.containment == 'document' || o.containment == 'window') this.containment = [
-               0 - this.offset.relative.left - this.offset.parent.left,
-               0 - this.offset.relative.top - this.offset.parent.top,
-               $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
-               ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
-          ];
+          var ce, co, over,
+               o = this.options;
+          if(o.containment === "parent") {
+               o.containment = this.helper[0].parentNode;
+          }
+          if(o.containment === "document" || o.containment === "window") {
+               this.containment = [
+                    0 - this.offset.relative.left - this.offset.parent.left,
+                    0 - this.offset.relative.top - this.offset.parent.top,
+                    $(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left,
+                    ($(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+               ];
+          }
 
           if(!(/^(document|window|parent)$/).test(o.containment)) {
-               var ce = $(o.containment)[0];
-               var co = $(o.containment).offset();
-               var over = ($(ce).css("overflow") != 'hidden');
+               ce = $(o.containment)[0];
+               co = $(o.containment).offset();
+               over = ($(ce).css("overflow") !== "hidden");
 
                this.containment = [
@@ -1908 +2956 @@
      _convertPositionTo: function(d, pos) {
 
-          if(!pos) pos = this.position;
-          var mod = d == "absolute" ? 1 : -1;
-          var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+          if(!pos) {
+               pos = this.position;
+          }
+          var mod = d === "absolute" ? 1 : -1,
+               scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
+               scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
 
           return {
                top: (
-                    pos.top                                                                                   // The absolute mouse position
-                    + this.offset.relative.top * mod                                                // Only for relative positioned nodes: Relative offset from element to offset parent
-                    + this.offset.parent.top * mod                                                       // The offsetParent's offset without borders (offset + border)
-                    - ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+                    pos.top   +                                                                               // The absolute mouse position
+                    this.offset.relative.top * mod +                                                // Only for relative positioned nodes: Relative offset from element to offset parent
+                    this.offset.parent.top * mod -                                                       // The offsetParent's offset without borders (offset + border)
+                    ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
                ),
                left: (
-                    pos.left                                                                             // The absolute mouse position
-                    + this.offset.relative.left * mod                                               // Only for relative positioned nodes: Relative offset from element to offset parent
-                    + this.offset.parent.left * mod                                                      // The offsetParent's offset without borders (offset + border)
-                    - ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+                    pos.left +                                                                                // The absolute mouse position
+                    this.offset.relative.left * mod +                                               // Only for relative positioned nodes: Relative offset from element to offset parent
+                    this.offset.parent.left * mod -                                                 // The offsetParent's offset without borders (offset + border)
+                    ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
                )
           };
@@ -1931 +2982 @@
      _generatePosition: function(event) {
 
-          var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+          var top, left,
+               o = this.options,
+               pageX = event.pageX,
+               pageY = event.pageY,
+               scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
 
           // This is another very weird special case that only happens for relative elements:
@@ -1937 +2992 @@
           // 2. and the scroll parent is the document or similar to the offset parent
           // we have to refresh the relative offset during the scroll so there are no jumps
-          if(this.cssPosition == 'relative' && !(this.scrollParent[0] != document && this.scrollParent[0] != this.offsetParent[0])) {
+          if(this.cssPosition === "relative" && !(this.scrollParent[0] !== document && this.scrollParent[0] !== this.offsetParent[0])) {
                this.offset.relative = this._getRelativeOffset();
           }
-
-          var pageX = event.pageX;
-          var pageY = event.pageY;
 
           /*
@@ -1952 +3004 @@
 
                if(this.containment) {
-                    if(event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
-                    if(event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
-                    if(event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
-                    if(event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
+                    if(event.pageX - this.offset.click.left < this.containment[0]) {
+                         pageX = this.containment[0] + this.offset.click.left;
+                    }
+                    if(event.pageY - this.offset.click.top < this.containment[1]) {
+                         pageY = this.containment[1] + this.offset.click.top;
+                    }
+                    if(event.pageX - this.offset.click.left > this.containment[2]) {
+                         pageX = this.containment[2] + this.offset.click.left;
+                    }
+                    if(event.pageY - this.offset.click.top > this.containment[3]) {
+                         pageY = this.containment[3] + this.offset.click.top;
+                    }
                }
 
                if(o.grid) {
-                    var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
-                    pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-
-                    var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
-                    pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+                    top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
+                    pageY = this.containment ? ( (top - this.offset.click.top >= this.containment[1] && top - this.offset.click.top <= this.containment[3]) ? top : ((top - this.offset.click.top >= this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+                    left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
+                    pageX = this.containment ? ( (left - this.offset.click.left >= this.containment[0] && left - this.offset.click.left <= this.containment[2]) ? left : ((left - this.offset.click.left >= this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
                }
 
@@ -1970 +3030 @@
           return {
                top: (
-                    pageY                                                                                // The absolute mouse position
-                    - this.offset.click.top                                                              // Click offset (relative to the element)
-                    - this.offset.relative.top                                                           // Only for relative positioned nodes: Relative offset from element to offset parent
-                    - this.offset.parent.top                                                        // The offsetParent's offset without borders (offset + border)
-                    + ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+                    pageY -                                                                              // The absolute mouse position
+                    this.offset.click.top -                                                              // Click offset (relative to the element)
+                    this.offset.relative.top -                                                      // Only for relative positioned nodes: Relative offset from element to offset parent
+                    this.offset.parent.top +                                                        // The offsetParent's offset without borders (offset + border)
+                    ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
                ),
                left: (
-                    pageX                                                                                // The absolute mouse position
-                    - this.offset.click.left                                                        // Click offset (relative to the element)
-                    - this.offset.relative.left                                                          // Only for relative positioned nodes: Relative offset from element to offset parent
-                    - this.offset.parent.left                                                            // The offsetParent's offset without borders (offset + border)
-                    + ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+                    pageX -                                                                              // The absolute mouse position
+                    this.offset.click.left -                                                        // Click offset (relative to the element)
+                    this.offset.relative.left     -                                                      // Only for relative positioned nodes: Relative offset from element to offset parent
+                    this.offset.parent.left +                                                            // The offsetParent's offset without borders (offset + border)
+                    ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
                )
           };
@@ -1989 +3049 @@
      _rearrange: function(event, i, a, hardRefresh) {
 
-          a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling));
+          a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction === "down" ? i.item[0] : i.item[0].nextSibling));
 
           //Various things done here to improve the performance:
@@ -2000 +3060 @@
 
           this._delay(function() {
-               if(counter == this.counter) this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
+               if(counter === this.counter) {
+                    this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
+               }
           });
 
@@ -2010 +3072 @@
           // We delay all events that have to be triggered to after the point where the placeholder has been removed and
           // everything else normalized again
-          var delayedTriggers = [];
+          var i,
+               delayedTriggers = [];
 
           // We first have to update the dom position of the actual currentItem
           // Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
-          if(!this._noFinalSort && this.currentItem.parent().length) this.placeholder.before(this.currentItem);
+          if(!this._noFinalSort && this.currentItem.parent().length) {
+               this.placeholder.before(this.currentItem);
+          }
           this._noFinalSort = null;
 
-          if(this.helper[0] == this.currentItem[0]) {
-               for(var i in this._storedCSS) {
-                    if(this._storedCSS[i] == 'auto' || this._storedCSS[i] == 'static') this._storedCSS[i] = '';
+          if(this.helper[0] === this.currentItem[0]) {
+               for(i in this._storedCSS) {
+                    if(this._storedCSS[i] === "auto" || this._storedCSS[i] === "static") {
+                         this._storedCSS[i] = "";
+                    }
                }
                this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
@@ -2026 +3093 @@
           }
 
-          if(this.fromOutside && !noPropagation) delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
-          if((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) && !noPropagation) delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
+          if(this.fromOutside && !noPropagation) {
+               delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
+          }
+          if((this.fromOutside || this.domPosition.prev !== this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent !== this.currentItem.parent()[0]) && !noPropagation) {
+               delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
+          }
 
           // Check if the items Container has Changed and trigger appropriate
@@ -2041 +3112 @@
 
           //Post events to containers
-          for (var i = this.containers.length - 1; i >= 0; i--){
-               if(!noPropagation) delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+          for (i = this.containers.length - 1; i >= 0; i--){
+               if(!noPropagation) {
+                    delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+               }
                if(this.containers[i].containerCache.over) {
                     delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
@@ -2050 +3123 @@
 
           //Do what was originally in plugins
-          if(this._storedCursor) $('body').css("cursor", this._storedCursor); //Reset cursor
-          if(this._storedOpacity) this.helper.css("opacity", this._storedOpacity); //Reset opacity
-          if(this._storedZIndex) this.helper.css("zIndex", this._storedZIndex == 'auto' ? '' : this._storedZIndex); //Reset z-index
+          if ( this.storedCursor ) {
+               this.document.find( "body" ).css( "cursor", this.storedCursor );
+               this.storedStylesheet.remove();
+          }
+          if(this._storedOpacity) {
+               this.helper.css("opacity", this._storedOpacity);
+          }
+          if(this._storedZIndex) {
+               this.helper.css("zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex);
+          }
 
           this.dragging = false;
@@ -2058 +3138 @@
                if(!noPropagation) {
                     this._trigger("beforeStop", event, this._uiHash());
-                    for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
+                    for (i=0; i < delayedTriggers.length; i++) {
+                         delayedTriggers[i].call(this, event);
+                    } //Trigger all delayed events
                     this._trigger("stop", event, this._uiHash());
                }
@@ -2066 +3148 @@
           }
 
-          if(!noPropagation) this._trigger("beforeStop", event, this._uiHash());
+          if(!noPropagation) {
+               this._trigger("beforeStop", event, this._uiHash());
+          }
 
           //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
           this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
 
-          if(this.helper[0] != this.currentItem[0]) this.helper.remove(); this.helper = null;
+          if(this.helper[0] !== this.currentItem[0]) {
+               this.helper.remove();
+          }
+          this.helper = null;
 
           if(!noPropagation) {
-               for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
+               for (i=0; i < delayedTriggers.length; i++) {
+                    delayedTriggers[i].call(this, event);
+               } //Trigger all delayed events
                this._trigger("stop", event, this._uiHash());
           }
@@ -2117 +3206 @@
 
 $.widget( "ui.accordion", {
-     version: "1.9.2",
+     version: "1.10.3",
      options: {
           active: 0,
@@ -2136 +3225 @@
 
      _create: function() {
-          var accordionId = this.accordionId = "ui-accordion-" +
-                    (this.element.attr( "id" ) || ++uid),
-               options = this.options;
-
+          var options = this.options;
           this.prevShow = this.prevHide = $();
-          this.element.addClass( "ui-accordion ui-widget ui-helper-reset" );
-
-          this.headers = this.element.find( options.header )
-               .addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" );
-          this._hoverable( this.headers );
-          this._focusable( this.headers );
-
-          this.headers.next()
-               .addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" )
-               .hide();
+          this.element.addClass( "ui-accordion ui-widget ui-helper-reset" )
+               // ARIA
+               .attr( "role", "tablist" );
 
           // don't allow collapsible: false and active: false / null
@@ -2156 +3235 @@
                options.active = 0;
           }
+
+          this._processPanels();
           // handle negative values
           if ( options.active < 0 ) {
                options.active += this.headers.length;
           }
-          this.active = this._findActive( options.active )
-               .addClass( "ui-accordion-header-active ui-state-active" )
-               .toggleClass( "ui-corner-all ui-corner-top" );
-          this.active.next()
-               .addClass( "ui-accordion-content-active" )
-               .show();
-
-          this._createIcons();
-          this.refresh();
-
-          // ARIA
-          this.element.attr( "role", "tablist" );
-
-          this.headers
-               .attr( "role", "tab" )
-               .each(function( i ) {
-                    var header = $( this ),
-                         headerId = header.attr( "id" ),
-                         panel = header.next(),
-                         panelId = panel.attr( "id" );
-                    if ( !headerId ) {
-                         headerId = accordionId + "-header-" + i;
-                         header.attr( "id", headerId );
-                    }
-                    if ( !panelId ) {
-                         panelId = accordionId + "-panel-" + i;
-                         panel.attr( "id", panelId );
-                    }
-                    header.attr( "aria-controls", panelId );
-                    panel.attr( "aria-labelledby", headerId );
-               })
-               .next()
-                    .attr( "role", "tabpanel" );
-
-          this.headers
-               .not( this.active )
-               .attr({
-                    "aria-selected": "false",
-                    tabIndex: -1
-               })
-               .next()
-                    .attr({
-                         "aria-expanded": "false",
-                         "aria-hidden": "true"
-                    })
-                    .hide();
-
-          // make sure at least one header is in the tab order
-          if ( !this.active.length ) {
-               this.headers.eq( 0 ).attr( "tabIndex", 0 );
-          } else {
-               this.active.attr({
-                    "aria-selected": "true",
-                    tabIndex: 0
-               })
-               .next()
-                    .attr({
-                         "aria-expanded": "true",
-                         "aria-hidden": "false"
-                    });
-          }
-
-          this._on( this.headers, { keydown: "_keydown" });
-          this._on( this.headers.next(), { keydown: "_panelKeyDown" });
-          this._setupEvents( options.event );
+          this._refresh();
      },
 
@@ -2230 +3247 @@
           return {
                header: this.active,
+               panel: !this.active.length ? $() : this.active.next(),
                content: !this.active.length ? $() : this.active.next()
           };
@@ -2331 +3349 @@
 
      _keydown: function( event ) {
+          /*jshint maxcomplexity:15*/
           if ( event.altKey || event.ctrlKey ) {
                return;
@@ -2376 +3395 @@
 
      refresh: function() {
-          var maxHeight, overflow,
-               heightStyle = this.options.heightStyle,
-               parent = this.element.parent();
-
+          var options = this.options;
+          this._processPanels();
+
+          // was collapsed or no panel
+          if ( ( options.active === false && options.collapsible === true ) || !this.headers.length ) {
+               options.active = false;
+               this.active = $();
+          // active false only when collapsible is true
+          } else if ( options.active === false ) {
+               this._activate( 0 );
+          // was active, but active panel is gone
+          } else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
+               // all remaining panel are disabled
+               if ( this.headers.length === this.headers.find(".ui-state-disabled").length ) {
+                    options.active = false;
+                    this.active = $();
+               // activate previous panel
+               } else {
+                    this._activate( Math.max( 0, options.active - 1 ) );
+               }
+          // was active, active panel still exists
+          } else {
+               // make sure active index is correct
+               options.active = this.headers.index( this.active );
+          }
+
+          this._destroyIcons();
+
+          this._refresh();
+     },
+
+     _processPanels: function() {
+          this.headers = this.element.find( this.options.header )
+               .addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" );
+
+          this.headers.next()
+               .addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" )
+               .filter(":not(.ui-accordion-content-active)")
+               .hide();
+     },
+
+     _refresh: function() {
+          var maxHeight,
+               options = this.options,
+               heightStyle = options.heightStyle,
+               parent = this.element.parent(),
+               accordionId = this.accordionId = "ui-accordion-" +
+                    (this.element.attr( "id" ) || ++uid);
+
+          this.active = this._findActive( options.active )
+               .addClass( "ui-accordion-header-active ui-state-active ui-corner-top" )
+               .removeClass( "ui-corner-all" );
+          this.active.next()
+               .addClass( "ui-accordion-content-active" )
+               .show();
+
+          this.headers
+               .attr( "role", "tab" )
+               .each(function( i ) {
+                    var header = $( this ),
+                         headerId = header.attr( "id" ),
+                         panel = header.next(),
+                         panelId = panel.attr( "id" );
+                    if ( !headerId ) {
+                         headerId = accordionId + "-header-" + i;
+                         header.attr( "id", headerId );
+                    }
+                    if ( !panelId ) {
+                         panelId = accordionId + "-panel-" + i;
+                         panel.attr( "id", panelId );
+                    }
+                    header.attr( "aria-controls", panelId );
+                    panel.attr( "aria-labelledby", headerId );
+               })
+               .next()
+                    .attr( "role", "tabpanel" );
+
+          this.headers
+               .not( this.active )
+               .attr({
+                    "aria-selected": "false",
+                    tabIndex: -1
+               })
+               .next()
+                    .attr({
+                         "aria-expanded": "false",
+                         "aria-hidden": "true"
+                    })
+                    .hide();
+
+          // make sure at least one header is in the tab order
+          if ( !this.active.length ) {
+               this.headers.eq( 0 ).attr( "tabIndex", 0 );
+          } else {
+               this.active.attr({
+                    "aria-selected": "true",
+                    tabIndex: 0
+               })
+               .next()
+                    .attr({
+                         "aria-expanded": "true",
+                         "aria-hidden": "false"
+                    });
+          }
+
+          this._createIcons();
+
+          this._setupEvents( options.event );
 
           if ( heightStyle === "fill" ) {
-               // IE 6 treats height like minHeight, so we need to turn off overflow
-               // in order to get a reliable height
-               // we use the minHeight support test because we assume that only
-               // browsers that don't support minHeight will treat height as minHeight
-               if ( !$.support.minHeight ) {
-                    overflow = parent.css( "overflow" );
-                    parent.css( "overflow", "hidden");
-               }
                maxHeight = parent.height();
                this.element.siblings( ":visible" ).each(function() {
@@ -2400 +3515 @@
                     maxHeight -= elem.outerHeight( true );
                });
-               if ( overflow ) {
-                    parent.css( "overflow", overflow );
-               }
 
                this.headers.each(function() {
@@ -2447 +3559 @@
 
      _setupEvents: function( event ) {
-          var events = {};
-          if ( !event ) {
-               return;
-          }
-          $.each( event.split(" "), function( index, eventName ) {
-               events[ eventName ] = "_eventHandler";
-          });
+          var events = {
+               keydown: "_keydown"
+          };
+          if ( event ) {
+               $.each( event.split(" "), function( index, eventName ) {
+                    events[ eventName ] = "_eventHandler";
+               });
+          }
+
+          this._off( this.headers.add( this.headers.next() ) );
           this._on( this.headers, events );
+          this._on( this.headers.next(), { keydown: "_panelKeyDown" });
+          this._hoverable( this.headers );
+          this._focusable( this.headers );
      },
 
@@ -2633 +3751 @@
 });
 
-
-
-// DEPRECATED
-if ( $.uiBackCompat !== false ) {
-     // navigation options
-     (function( $, prototype ) {
-          $.extend( prototype.options, {
-               navigation: false,
-               navigationFilter: function() {
-                    return this.href.toLowerCase() === location.href.toLowerCase();
-               }
-          });
-
-          var _create = prototype._create;
-          prototype._create = function() {
-               if ( this.options.navigation ) {
-                    var that = this,
-                         headers = this.element.find( this.options.header ),
-                         content = headers.next(),
-                         current = headers.add( content )
-                              .find( "a" )
-                              .filter( this.options.navigationFilter )
-                              [ 0 ];
-                    if ( current ) {
-                         headers.add( content ).each( function( index ) {
-                              if ( $.contains( this, current ) ) {
-                                   that.options.active = Math.floor( index / 2 );
-                                   return false;
-                              }
-                         });
-                    }
-               }
-               _create.call( this );
-          };
-     }( jQuery, jQuery.ui.accordion.prototype ) );
-
-     // height options
-     (function( $, prototype ) {
-          $.extend( prototype.options, {
-               heightStyle: null, // remove default so we fall back to old values
-               autoHeight: true, // use heightStyle: "auto"
-               clearStyle: false, // use heightStyle: "content"
-               fillSpace: false // use heightStyle: "fill"
-          });
-
-          var _create = prototype._create,
-               _setOption = prototype._setOption;
-
-          $.extend( prototype, {
-               _create: function() {
-                    this.options.heightStyle = this.options.heightStyle ||
-                         this._mergeHeightStyle();
-
-                    _create.call( this );
-               },
-
-               _setOption: function( key ) {
-                    if ( key === "autoHeight" || key === "clearStyle" || key === "fillSpace" ) {
-                         this.options.heightStyle = this._mergeHeightStyle();
-                    }
-                    _setOption.apply( this, arguments );
-               },
-
-               _mergeHeightStyle: function() {
-                    var options = this.options;
-
-                    if ( options.fillSpace ) {
-                         return "fill";
-                    }
-
-                    if ( options.clearStyle ) {
-                         return "content";
-                    }
-
-                    if ( options.autoHeight ) {
-                         return "auto";
-                    }
-               }
-          });
-     }( jQuery, jQuery.ui.accordion.prototype ) );
-
-     // icon options
-     (function( $, prototype ) {
-          $.extend( prototype.options.icons, {
-               activeHeader: null, // remove default so we fall back to old values
-               headerSelected: "ui-icon-triangle-1-s"
-          });
-
-          var _createIcons = prototype._createIcons;
-          prototype._createIcons = function() {
-               if ( this.options.icons ) {
-                    this.options.icons.activeHeader = this.options.icons.activeHeader ||
-                         this.options.icons.headerSelected;
-               }
-               _createIcons.call( this );
-          };
-     }( jQuery, jQuery.ui.accordion.prototype ) );
-
-     // expanded active option, activate method
-     (function( $, prototype ) {
-          prototype.activate = prototype._activate;
-
-          var _findActive = prototype._findActive;
-          prototype._findActive = function( index ) {
-               if ( index === -1 ) {
-                    index = false;
-               }
-               if ( index && typeof index !== "number" ) {
-                    index = this.headers.index( this.headers.filter( index ) );
-                    if ( index === -1 ) {
-                         index = false;
-                    }
-               }
-               return _findActive.call( this, index );
-          };
-     }( jQuery, jQuery.ui.accordion.prototype ) );
-
-     // resize method
-     jQuery.ui.accordion.prototype.resize = jQuery.ui.accordion.prototype.refresh;
-
-     // change events
-     (function( $, prototype ) {
-          $.extend( prototype.options, {
-               change: null,
-               changestart: null
-          });
-
-          var _trigger = prototype._trigger;
-          prototype._trigger = function( type, event, data ) {
-               var ret = _trigger.apply( this, arguments );
-               if ( !ret ) {
-                    return false;
-               }
-
-               if ( type === "beforeActivate" ) {
-                    ret = _trigger.call( this, "changestart", event, {
-                         oldHeader: data.oldHeader,
-                         oldContent: data.oldPanel,
-                         newHeader: data.newHeader,
-                         newContent: data.newPanel
-                    });
-               } else if ( type === "activate" ) {
-                    ret = _trigger.call( this, "change", event, {
-                         oldHeader: data.oldHeader,
-                         oldContent: data.oldPanel,
-                         newHeader: data.newHeader,
-                         newContent: data.newPanel
-                    });
-               }
-               return ret;
-          };
-     }( jQuery, jQuery.ui.accordion.prototype ) );
-
-     // animated option
-     // NOTE: this only provides support for "slide", "bounceslide", and easings
-     // not the full $.ui.accordion.animations API
-     (function( $, prototype ) {
-          $.extend( prototype.options, {
-               animate: null,
-               animated: "slide"
-          });
-
-          var _create = prototype._create;
-          prototype._create = function() {
-               var options = this.options;
-               if ( options.animate === null ) {
-                    if ( !options.animated ) {
-                         options.animate = false;
-                    } else if ( options.animated === "slide" ) {
-                         options.animate = 300;
-                    } else if ( options.animated === "bounceslide" ) {
-                         options.animate = {
-                              duration: 200,
-                              down: {
-                                   easing: "easeOutBounce",
-                                   duration: 1000
-                              }
-                         };
-                    } else {
-                         options.animate = options.animated;
-                    }
-               }
-
-               _create.call( this );
-          };
-     }( jQuery, jQuery.ui.accordion.prototype ) );
-}
-
 })( jQuery );

plugins/widgets/dragdrop.js

@@ -1 @@
-ToolMan._coordinatesFactory.inside = function(item,container) {
-     var iTL = this.topLeftOffset(item);
-     var iBR = this.bottomRightOffset(item);
-     var cTL = this.topLeftOffset(container);
-     var cBR = this.bottomRightOffset(container);
+$(function() {
      
-     return (iTL.x >= cTL.x && iTL.x <= cBR.x && iTL.y >= cTL.y && iTL.y <= cBR.y)
-     || (iBR.x >= cTL.x && iBR.x <= cBR.x && iBR.y >= cTL.y && iBR.y <= cBR.y);
-}
-
-ToolMan._dragdropFactory = {
-     firstContainer: null,
-     lastContainer: null,
+     // clean
+     $('.js-remove').remove();
+     $('.js-hide').hide();
+     $('.widgetSettings').hide();
      
-     makeDragable: function(item) {
-          var group = ToolMan.drag().createSimpleGroup(item);
-          group.register('dragstart',this._onDragStart);
-          group.register('dragmove', this._onDragMove);
-          group.register('dragend', this._onDragEnd);
-          
-          item.isOutside = false;
-          item.started = false;
-          
-          return group;
-     },
+     // move
+     $( ".connected" ).sortable({
+          axis: "y",
+          connectWith: ".connected",
+          cursor: "move",
+          stop: function( event, ui ) {
+               $('.connected').each(function(){
+                    if( $(this).find('li').length == 0 ) {
+                         $(this).parents('.widgets').find('.empty-widgets').show();
+                    } else {
+                         $(this).parents('.widgets').find('.empty-widgets').hide();
+                    }
+               });
+          }//,
+          //change: function( event, ui ) {
+               //ui.helper.css('height', $('#dndnav .widget-name').css('height'));
+          //}
+     });
      
-     makeListContainer: function(list,name) {
-          // each container becomes a linked list node
-          if (this.firstContainer == null) {
-               this.firstContainer = this.lastContainer = list;
-               list.previousContainer = null;
-               list.nextContainer = null;
-          } else {
-               list.previousContainer = this.lastContainer;
-               list.nextContainer = null;
-               this.lastContainer.nextContainer = list;
-               this.lastContainer = list;
-          }
-          
-          var helpers = ToolMan.helpers();
-          var coordinates = ToolMan.coordinates();
-          
-          //var children = list.childNodes;
-          var items = new Array();
-          for (var i=0; i<list.childNodes.length; i++) {
-               if (list.childNodes[i].nodeType == 1 &&
-               list.childNodes[i].nodeName.toLowerCase() == name.toLowerCase()) {
-                    items.push(list.childNodes[i]);
-               }
-          }
-          
-          // these functions are called when an item is draged over
-          // a container or out of a container bounds.  onDragOut
-          // is also called when the drag ends with an item having
-          // been added to the container
-          list.onDragOver = new Function();
-          list.onDragOut = new Function();
-          list.onDragEnd = new Function();
-          
-          if (list.factory == undefined) {
-               list.factory = false;
-          }
-          
-          var This = this;
-          helpers.map(items, function(item) {
-               var dragGroup = This.makeDragable(item);
-               dragGroup.setThreshold(4);
-          });
-          for (var i = 2, n = arguments.length; i < n; i++) {
-               helpers.map(items, arguments[i]);
-          }
-     },
+     // add
+     $( "#widgets > li" ).draggable({
+          connectToSortable: ".connected",
+          helper: "clone",
+          revert: "invalid",
+          cursor: "move",
+          start: function( event, ui ) {
+               ui.helper.css({'width': $('#widgets > li').css('width')});
+               //ui.helper.css({'min-height': $('#dndnav .widget-name').css('height')});
+               //ui.helper.find('.form-note').hide();
+               //ui.helper.find('.widget-name').css({'min-height': $('#dndnav .widget-name').css('height')});
+          }/*,
+          stop: function( event, ui ) {
+               $('.empty-widgets').css('display', 'none');
+          }*/
+     });
      
-     _onDragStart: function(dragEvent) {
-          var container = ToolMan._dragdropFactory.firstContainer;
-          var item = dragEvent.group.element;
-          var coordinates = ToolMan.coordinates();
-          
-          // Factory is a sort of assembly pieces, we want to keep them
-          if (item.parentNode.factory) {
-               var origin = item.cloneNode(true);
-               item.parentNode.insertBefore(origin,item.nextSibling);
-               ToolMan._dragdropFactory.makeDragable(origin);
-          }
-          
-          while (container != null) {
-               container.topLeft = coordinates.topLeftOffset(container);
-               container.bottomRight = coordinates.bottomRightOffset(container);
-               container = container.nextContainer;
-          }
-          
-          // item starts out over current parent
-          item.started = true;
-          item.parentNode.onDragOver();
-     },
+     $( "#widgets, .connected" ).disableSelection();
      
-     _onDragMove: function(dragEvent) {
-          var helpers = ToolMan.helpers();
-          var coordinates = ToolMan.coordinates();
-          
-          var item = dragEvent.group.element;
-          var xmouse = dragEvent.transformedMouseOffset;
-          var moveTo = null;
-          
-          // Check if we are nowhere
-          if (item.isOutside) {
-               var container = ToolMan._dragdropFactory.firstContainer;
-               while (container != null) {
-                    if (coordinates.inside(item,container) && !container.factory) {
-                         container.onDragOver();
-                         item.isOutside = false;
-                         
-                         // since isOutside was true, the current parent is a
-                         // temporary clone of some previous container node and
-                         // it needs to be removed from the document
-                         var tempParent = item.parentNode;
-                         tempParent.removeChild(item);
-                         container.appendChild(item);
-                         //tempParent.parentNode.removeChild(tempParent);
-                         
-                         break;
-                    }
-                    container = container.nextContainer;
-               }
-               
-               if (this.isOutside) {
-                    return;
-               }
-          }
-          // Outside the parent node
-          else if (!coordinates.inside(item,item.parentNode)) {
-               item.parentNode.onDragOut();
-               item.isOutside = true;
-               var container = ToolMan._dragdropFactory.firstContainer;
-               while (container != null) {
-                    if (coordinates.inside(item,container) && !container.factory) {
-                         container.onDragOver();
-                         item.isOutside = false;
-                         container.appendChild(item);
-                         break;
-                    }
-                    container = container.nextContainer;
-               }
-               // if we're not in any container now, make a temporary clone of
-               // the previous container node and add it to the document
-               if (this.isOutside) {
-                    var tempParent = item.parentNode.cloneNode(false);
-                    item.parentNode.removeChild(item);
-                    tempParent.appendChild(item);
-                    document.body.appendChild(tempParent);
-                    return;
-               }
-          }
-          
-          // if we get here, we're inside some container bounds, so we do
-          // everything the original dragsort script did to swap us into the
-          // correct position
-          
-          if (item.parentNode.factory) {
-               return;
-          }
-          
-          var moveTo = null
-          
-          var previous = helpers.previousItem(item, item.nodeName)
-          while (previous != null) {
-               var bottomRight = coordinates.bottomRightOffset(previous)
-               if (xmouse.y <= bottomRight.y && xmouse.x <= bottomRight.x) {
-                    moveTo = previous
-               }
-               previous = helpers.previousItem(previous, item.nodeName)
-          }
-          if (moveTo != null) {
-               helpers.moveBefore(item, moveTo)
-               return
-          }
-          
-          var next = helpers.nextItem(item, item.nodeName)
-          while (next != null) {
-               var topLeft = coordinates.topLeftOffset(next)
-               if (topLeft.y <= xmouse.y && topLeft.x <= xmouse.x) {
-                    moveTo = next
-               }
-               next = helpers.nextItem(next, item.nodeName)
-          }
-          if (moveTo != null) {
-               helpers.moveBefore(item, helpers.nextItem(moveTo, item.nodeName))
-               return
-          }
-     },
-     
-     _onDragEnd: function(dragEvent) {
-          var item = dragEvent.group.element;
-          
-          if (!item.started) {
-               return;
-          }
-          
-          if (item.isOutside || item.parentNode.factory) {
-               item.parentNode.removeChild(item);
-               return;
-          }
-          
-          item.parentNode.onDragEnd.call(item);
-          ToolMan.coordinates().create(0, 0).reposition(dragEvent.group.element);
-     }
-};
-
-ToolMan.dragdrop = function() {
-     return ToolMan._dragdropFactory;
-};
+});

plugins/widgets/index.php

@@ -165 +165 @@
   <?php echo file_get_contents(dirname(__FILE__).'/style.css'); ?>
   </style>
-  <script type="text/javascript" src="js/tool-man/core.js"></script>
-  <script type="text/javascript" src="js/tool-man/events.js"></script>
-  <script type="text/javascript" src="js/tool-man/css.js"></script>
-  <script type="text/javascript" src="js/tool-man/coordinates.js"></script>
-  <script type="text/javascript" src="js/tool-man/drag.js"></script>
+     <script type="text/javascript" src="js/jquery/jquery-ui.custom.js"></script>
+  <script type="text/javascript" src="index.php?pf=widgets/widgets.js"></script>
   <?php 
      $core->auth->user_prefs->addWorkspace('accessibility'); 
@@ -177 +174 @@
   <script type="text/javascript" src="index.php?pf=widgets/dragdrop.js"></script>
   <?php endif; ?>
-  <script type="text/javascript" src="index.php?pf=widgets/widgets.js"></script>
   <script type="text/javascript">
   //<![CDATA[
@@ -199 +195 @@
 '<h3>'.__('Available widgets').'</h3>'.
 '<p>'.__('Move widgets from this list to one of the sidebars.').'</p>'.
-'<div id="widgets">';
+'<ul id="widgets">';
 
 $j = 0;
 foreach ($__widgets->elements(true) as $w) {
      echo
-     '<div>'.form::hidden(array('w[void][0][id]'),html::escapeHTML($w->id())).
+     '<li>'.form::hidden(array('w[void][0][id]'),html::escapeHTML($w->id())).
      '<p class="widget-name">'.form::field(array('w[void][0][order]'),2,3,0,'hideControl').' '.
      $w->name().($w->desc() != '' ? ' <span class="form-note">'.__($w->desc()).'</span>' : '').'</p>'.
@@ -210 +206 @@
      form::combo(array('addw['.$w->id().']'),$append_combo).'</p>'.
      '<div class="widgetSettings">'.$w->formSettings('w[void][0]',$j).'</div>'.
-     '</div>';
+     '</li>';
      $j++;
 }
 
 echo
-'</div>'.
-'<p><input type="submit" class="js-remove" name="append" value="'.__('Add widgets to sidebars').'" />'.
-$core->formNonce().'</p>'.
+'</ul>'.
+$core->formNonce().
+'<p class="js-remove"><input type="submit" name="append" value="'.__('Add widgets to sidebars').'" /></p>'.
 '</form>';
 
@@ -316 +312 @@
 function sidebarWidgets($id,$title,$widgets,$pr,$default_widgets,&$j)
 {
-     $res = '<h3>'.$title.'</h3><div id="'.$id.'">';
+     $res = '<h3>'.$title.'</h3>';
      
      if (!($widgets instanceof dcWidgets))
@@ -325 +321 @@
      if ($widgets->isEmpty()) {
           $res .= '<p class="empty-widgets">'.__('No widget.').'</p>';
-     }
+     } else {
+          $res .= '<p class="empty-widgets" style="display: none;">'.__('No widget.').'</p>';
+     }
+     
+     $res .= '<ul id="'.$id.'" class="connected">';
      
      $i = 0;
@@ -333 +333 @@
           
           $res .=
-          '<div>'.form::hidden(array($iname.'[id]'),html::escapeHTML($w->id())).
+          '<li>'.form::hidden(array($iname.'[id]'),html::escapeHTML($w->id())).
           '<p class="widget-name">'.form::field(array($iname.'[order]'),2,3,(string) $i,'js-hide','',0,'title="'.__('order').'"').' '.
           $w->name().($w->desc() != '' ? ' <!-- <span class="form-note">'.__($w->desc()).'</span> -->' : '').'</p>'.
@@ -340 +340 @@
           '</label></p>'.
           '<div class="widgetSettings">'.$w->formSettings($iname,$j).'</div>'.
-          '</div>';
+          '</li>';
           
           $i++;
@@ -346 +346 @@
      }
      
-     $res .= '</div>';
+     $res .= '</ul>';
      
      return $res;

plugins/widgets/style.css

@@ -6 +6 @@
      margin: 0 1% 0 0;
 }
-#widgets > div {
+#widgets > li {
      border: 1px solid #ccc;
      margin-bottom: .5em;
@@ -12 +12 @@
      min-height: 3em;
      padding: 0 0 4px 0;
+     list-style: none;
 }
 #widgets .widget-name, #widgets .js-remove {
@@ -41 +42 @@
      padding: 1em 0;
 }
-#dndnav > div, #dndextra > div, #dndcustom > div {
+#dndnav > li, #dndextra > li, #dndcustom > li {
      padding: O;
      border: 1px solid #999;
      margin-bottom: 1em;
+     list-style: none;
 }
+#dndnav .form-note, #dndextra .form-note, #dndcustom .form-note {
+     display: none;
+}
+
 
 .widget-name {

plugins/widgets/widgets.js

@@ -1 @@
-var dragdrop = ToolMan.dragdrop();
-$(function() {
+dotclear.postExpander = function(line) {
+     var title = $(line).find('.widget-name');
+     
+     var img = document.createElement('img');
+     img.src = dotclear.img_plus_src;
+     img.alt = dotclear.img_plus_alt;
+     img.className = 'expand';
+     $(img).css('cursor','pointer');
+     img.line = line;
+     img.onclick = function() { dotclear.viewPostContent(this.line); };
+     
+     title.prepend(img);
+};
+
+dotclear.viewPostContent = function(line,action) {
+     var action = action || 'toogle';
+     var img = $(line).find('.expand');
+     var isopen = img.attr('alt') == dotclear.img_plus_alt;
+     
+     if( action == 'close' || ( action == 'toogle' && !isopen ) ) {
+          $(line).find('.widgetSettings').hide();
+          img.attr('src', dotclear.img_plus_src);
+          img.attr('alt', dotclear.img_plus_alt);
+     } else if ( action == 'open' || ( action == 'toogle' && isopen ) ) {
+          $(line).find('.widgetSettings').show();
+          img.attr('src', dotclear.img_minus_src);
+          img.attr('alt', dotclear.img_minus_alt);
+     }
+     
+};
+
+$(function() { 
      $('input[name="wreset"]').click(function() {
           return window.confirm(dotclear.msg.confirm_widgets_reset);
      });
+     
+     $('#dndnav > li, #dndextra > li, #dndcustom > li').each(function() {
+          dotclear.postExpander(this);
+          dotclear.viewPostContent(this, 'close');
+     });
+     
 });
-
-$(function() {
-     var widgets = document.getElementById('widgets');
+     
+     /*var widgets = document.getElementById('widgets');
      var w_nav = document.getElementById('dndnav');
      var w_ext = document.getElementById('dndextra');
      var w_custom = document.getElementById('dndcustom');
      
-     w_nav.className = 'hideControls';
-     w_ext.className = 'hideControls';
-     w_custom.className = 'hideControls';
+     $('#dndnav').addClass('hideControls');
+     $('#dndextra').addClass('hideControls');
+     $('#dndcustom').addClass('hideControls');
      
      removeElements(document.getElementById('listWidgets'),'input');
@@ -28 +63 @@
      configControls(w_ext);
      configControls(w_custom);
-     
-     dragdrop.makeListContainer(widgets,'div',setHandle);
-     if (!document.all) { widgets.factory = true; }
-     dragdrop.makeListContainer(w_nav,'div',setHandle);
-     w_nav.onDragEnd = navDragEnd;
-     dragdrop.makeListContainer(w_ext,'div',setHandle);
-     w_ext.onDragEnd = extraDragEnd;
-     dragdrop.makeListContainer(w_custom,'div',setHandle);
-     w_custom.onDragEnd = customDragEnd;
      
      // Helper to remove some elements
@@ -166 +192 @@
           }
      }
-     
-     function setHandle(item) {
-          //var handle = item.getElementsByTagName('h4').item(0);
-          var handle = $('p.widget-name',item).get(0);
-          $(handle).addClass('handler');
-          item.toolManDragGroup.setHandle(handle);
-     }
 });
 
@@ -225 +244 @@
           });
      });
-}
+}*/