alchemy_cms 2.9.1 → 3.0.0.rc5

data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js

@@ -0,0 +1,210 @@
+/*
+ * jQuery Iframe Transport Plugin 1.8.1
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+/*jslint unparam: true, nomen: true */
+/*global define, window, document */
+
+(function (factory) {
+    'use strict';
+    if (typeof define === 'function' && define.amd) {
+        // Register as an anonymous AMD module:
+        define(['jquery'], factory);
+    } else {
+        // Browser globals:
+        factory(window.jQuery);
+    }
+}(function ($) {
+    'use strict';
+
+    // Helper variable to create unique names for the transport iframes:
+    var counter = 0;
+
+    // The iframe transport accepts four additional options:
+    // options.fileInput: a jQuery collection of file input fields
+    // options.paramName: the parameter name for the file form data,
+    //  overrides the name property of the file input field(s),
+    //  can be a string or an array of strings.
+    // options.formData: an array of objects with name and value properties,
+    //  equivalent to the return data of .serializeArray(), e.g.:
+    //  [{name: 'a', value: 1}, {name: 'b', value: 2}]
+    // options.initialIframeSrc: the URL of the initial iframe src,
+    //  by default set to "javascript:false;"
+    $.ajaxTransport('iframe', function (options) {
+        if (options.async) {
+            // javascript:false as initial iframe src
+            // prevents warning popups on HTTPS in IE6:
+            /*jshint scripturl: true */
+            var initialIframeSrc = options.initialIframeSrc || 'javascript:false;',
+            /*jshint scripturl: false */
+                form,
+                iframe,
+                addParamChar;
+            return {
+                send: function (_, completeCallback) {
+                    form = $('<form style="display:none;"></form>');
+                    form.attr('accept-charset', options.formAcceptCharset);
+                    addParamChar = /\?/.test(options.url) ? '&' : '?';
+                    // XDomainRequest only supports GET and POST:
+                    if (options.type === 'DELETE') {
+                        options.url = options.url + addParamChar + '_method=DELETE';
+                        options.type = 'POST';
+                    } else if (options.type === 'PUT') {
+                        options.url = options.url + addParamChar + '_method=PUT';
+                        options.type = 'POST';
+                    } else if (options.type === 'PATCH') {
+                        options.url = options.url + addParamChar + '_method=PATCH';
+                        options.type = 'POST';
+                    }
+                    // IE versions below IE8 cannot set the name property of
+                    // elements that have already been added to the DOM,
+                    // so we set the name along with the iframe HTML markup:
+                    counter += 1;
+                    iframe = $(
+                        '<iframe src="' + initialIframeSrc +
+                            '" name="iframe-transport-' + counter + '"></iframe>'
+                    ).bind('load', function () {
+                        var fileInputClones,
+                            paramNames = $.isArray(options.paramName) ?
+                                    options.paramName : [options.paramName];
+                        iframe
+                            .unbind('load')
+                            .bind('load', function () {
+                                var response;
+                                // Wrap in a try/catch block to catch exceptions thrown
+                                // when trying to access cross-domain iframe contents:
+                                try {
+                                    response = iframe.contents();
+                                    // Google Chrome and Firefox do not throw an
+                                    // exception when calling iframe.contents() on
+                                    // cross-domain requests, so we unify the response:
+                                    if (!response.length || !response[0].firstChild) {
+                                        throw new Error();
+                                    }
+                                } catch (e) {
+                                    response = undefined;
+                                }
+                                // The complete callback returns the
+                                // iframe content document as response object:
+                                completeCallback(
+                                    200,
+                                    'success',
+                                    {'iframe': response}
+                                );
+                                // Fix for IE endless progress bar activity bug
+                                // (happens on form submits to iframe targets):
+                                $('<iframe src="' + initialIframeSrc + '"></iframe>')
+                                    .appendTo(form);
+                                window.setTimeout(function () {
+                                    // Removing the form in a setTimeout call
+                                    // allows Chrome's developer tools to display
+                                    // the response result
+                                    form.remove();
+                                }, 0);
+                            });
+                        form
+                            .prop('target', iframe.prop('name'))
+                            .prop('action', options.url)
+                            .prop('method', options.type);
+                        if (options.formData) {
+                            $.each(options.formData, function (index, field) {
+                                $('<input type="hidden"/>')
+                                    .prop('name', field.name)
+                                    .val(field.value)
+                                    .appendTo(form);
+                            });
+                        }
+                        if (options.fileInput && options.fileInput.length &&
+                                options.type === 'POST') {
+                            fileInputClones = options.fileInput.clone();
+                            // Insert a clone for each file input field:
+                            options.fileInput.after(function (index) {
+                                return fileInputClones[index];
+                            });
+                            if (options.paramName) {
+                                options.fileInput.each(function (index) {
+                                    $(this).prop(
+                                        'name',
+                                        paramNames[index] || options.paramName
+                                    );
+                                });
+                            }
+                            // Appending the file input fields to the hidden form
+                            // removes them from their original location:
+                            form
+                                .append(options.fileInput)
+                                .prop('enctype', 'multipart/form-data')
+                                // enctype must be set as encoding for IE:
+                                .prop('encoding', 'multipart/form-data');
+                        }
+                        form.submit();
+                        // Insert the file input fields at their original location
+                        // by replacing the clones with the originals:
+                        if (fileInputClones && fileInputClones.length) {
+                            options.fileInput.each(function (index, input) {
+                                var clone = $(fileInputClones[index]);
+                                $(input).prop('name', clone.prop('name'));
+                                clone.replaceWith(input);
+                            });
+                        }
+                    });
+                    form.append(iframe).appendTo(document.body);
+                },
+                abort: function () {
+                    if (iframe) {
+                        // javascript:false as iframe src aborts the request
+                        // and prevents warning popups on HTTPS in IE6.
+                        // concat is used to avoid the "Script URL" JSLint error:
+                        iframe
+                            .unbind('load')
+                            .prop('src', initialIframeSrc);
+                    }
+                    if (form) {
+                        form.remove();
+                    }
+                }
+            };
+        }
+    });
+
+    // The iframe transport returns the iframe content document as response.
+    // The following adds converters from iframe to text, json, html, xml
+    // and script.
+    // Please note that the Content-Type for JSON responses has to be text/plain
+    // or text/html, if the browser doesn't include application/json in the
+    // Accept header, else IE will show a download dialog.
+    // The Content-Type for XML responses on the other hand has to be always
+    // application/xml or text/xml, so IE properly parses the XML response.
+    // See also
+    // https://github.com/blueimp/jQuery-File-Upload/wiki/Setup#content-type-negotiation
+    $.ajaxSetup({
+        converters: {
+            'iframe text': function (iframe) {
+                return iframe && $(iframe[0].body).text();
+            },
+            'iframe json': function (iframe) {
+                return iframe && $.parseJSON($(iframe[0].body).text());
+            },
+            'iframe html': function (iframe) {
+                return iframe && $(iframe[0].body).html();
+            },
+            'iframe xml': function (iframe) {
+                var xmlDoc = iframe && iframe[0];
+                return xmlDoc && $.isXMLDoc(xmlDoc) ? xmlDoc :
+                        $.parseXML((xmlDoc.XMLDocument && xmlDoc.XMLDocument.xml) ||
+                            $(xmlDoc.body).html());
+            },
+            'iframe script': function (iframe) {
+                return iframe && $.globalEval($(iframe[0].body).text());
+            }
+        }
+    });
+
+}));

data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js

@@ -1,400 +1,429 @@
 /*
  * jQuery UI Nested Sortable
- * v 1.3.4 / 28 apr 2011
- * http://mjsarfatti.com/sandbox/nestedSortable
+ * v 1.3.5 / 21 jun 2012
+ * http://mjsarfatti.com/code/nestedSortable
  *
- * Depends:
- *  jquery.ui.sortable.js 1.8+
+ * Depends on:
+ *	 jquery.ui.sortable.js 1.8+
  *
- * License CC BY-SA 3.0
- * Copyright 2010-2011, Manuele J Sarfatti
+ * Copyright (c) 2010-2012 Manuele J Sarfatti
+ * Licensed under the MIT License
+ * http://www.opensource.org/licenses/mit-license.php
  */
 
-(function ($) {
+(function($) {
 
-  $.widget("ui.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
+	$.widget("mjs.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
 
-    options:{
-      tabSize:20,
-      disableNesting:'ui-nestedSortable-no-nesting',
-      errorClass:'ui-nestedSortable-error',
-      listType:'ol',
-      maxLevels:0,
-      revertOnError:1
-    },
+		options: {
+			tabSize: 20,
+			disableNesting: 'mjs-nestedSortable-no-nesting',
+			errorClass: 'mjs-nestedSortable-error',
+			doNotClear: false,
+			listType: 'ol',
+			maxLevels: 0,
+			protectRoot: false,
+			rootID: null,
+			rtl: false,
+			isAllowed: function(item, parent) { return true; }
+		},
 
-    _create:function () {
-      this.element.data('sortable', this.element.data('nestedSortable'));
-      return $.ui.sortable.prototype._create.apply(this, arguments);
-    },
+		_create: function() {
+			this.element.data('sortable', this.element.data('nestedSortable'));
 
-    destroy:function () {
-      this.element
-        .removeData("nestedSortable")
-        .unbind(".nestedSortable");
-      return $.ui.sortable.prototype.destroy.apply(this, arguments);
-    },
+			if (!this.element.is(this.options.listType))
+				throw new Error('nestedSortable: Please check the listType option is set to your actual list type');
 
-    _mouseDrag:function (event) {
+			return $.ui.sortable.prototype._create.apply(this, arguments);
+		},
 
-      //Compute the helpers position
-      this.position = this._generatePosition(event);
-      this.positionAbs = this._convertPositionTo("absolute");
-
-      if (!this.lastPositionAbs) {
-        this.lastPositionAbs = this.positionAbs;
-      }
-
-      //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)
-            this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
-          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)
-            this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
-          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)
-            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 (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(this, event);
-      }
-
-      //Regenerate the absolute position used for position checks
-      this.positionAbs = this._convertPositionTo("absolute");
-
-      //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';
-
-      //Rearrange
-      for (var 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;
-
-        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
-          ) {
-
-          $(itemElement).mouseenter();
-
-          this.direction = intersection == 1 ? "down" : "up";
-
-          if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
-            $(itemElement).mouseleave();
-            this._rearrange(event, item);
+		destroy: function() {
+			this.element
+				.removeData("nestedSortable")
+				.unbind(".nestedSortable");
+			return $.ui.sortable.prototype.destroy.apply(this, arguments);
+		},
+
+		_mouseDrag: function(event) {
+
+			//Compute the helpers position
+			this.position = this._generatePosition(event);
+			this.positionAbs = this._convertPositionTo("absolute");
+
+			if (!this.lastPositionAbs) {
+				this.lastPositionAbs = this.positionAbs;
+			}
+
+			var o = this.options;
+
+			//Do scrolling
+			if(this.options.scroll) {
+				var scrolled = false;
+				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)
+						this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+
+					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)
+						this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+
+				} else {
+
+					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(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(this, event);
+			}
+
+			//Regenerate the absolute position used for position checks
+			this.positionAbs = this._convertPositionTo("absolute");
+
+      // Find the top offset before rearrangement,
+      var previousTopOffset = this.placeholder.offset().top;
+
+			//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';
+
+			//Rearrange
+			for (var 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;
+
+				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
+				) {
+
+					$(itemElement).mouseenter();
+
+					this.direction = intersection == 1 ? "down" : "up";
+
+					if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
+						$(itemElement).mouseleave();
+						this._rearrange(event, item);
+					} else {
+						break;
+					}
+
+					// Clear emtpy ul's/ol's
+					this._clearEmpty(itemElement);
+
+					this._trigger("change", event, this._uiHash());
+					break;
+				}
+			}
+
+			var parentItem = (this.placeholder[0].parentNode.parentNode &&
+							 $(this.placeholder[0].parentNode.parentNode).closest('.ui-sortable').length)
+				       			? $(this.placeholder[0].parentNode.parentNode)
+				       			: null,
+			    level = this._getLevel(this.placeholder),
+			    childLevels = this._getChildLevels(this.helper);
+
+      // To find the previous sibling in the list, keep backtracking until we hit a valid list item.
+			var previousItem = this.placeholder[0].previousSibling ? $(this.placeholder[0].previousSibling) : null;
+			if (previousItem != null) {
+				while (previousItem[0].nodeName.toLowerCase() != 'li' || previousItem[0] == this.currentItem[0] || previousItem[0] == this.helper[0]) {
+					if (previousItem[0].previousSibling) {
+						previousItem = $(previousItem[0].previousSibling);
+					} else {
+						previousItem = null;
+						break;
+					}
+				}
+			}
+
+      // To find the next sibling in the list, keep stepping forward until we hit a valid list item.
+      var nextItem = this.placeholder[0].nextSibling ? $(this.placeholder[0].nextSibling) : null;
+      if (nextItem != null) {
+        while (nextItem[0].nodeName.toLowerCase() != 'li' || nextItem[0] == this.currentItem[0] || nextItem[0] == this.helper[0]) {
+          if (nextItem[0].nextSibling) {
+            nextItem = $(nextItem[0].nextSibling);
           } else {
-            break;
-          }
-
-          // Clear emtpy ul's/ol's
-          this._clearEmpty(itemElement);
-
-          this._trigger("change", event, this._uiHash());
-          break;
-        }
-      }
-
-      var parentItem = (this.placeholder[0].parentNode.parentNode
-          && $(this.placeholder[0].parentNode.parentNode).closest('.ui-sortable').length)
-          ? $(this.placeholder[0].parentNode.parentNode)
-          : null,
-        level = this._getLevel(this.placeholder),
-        childLevels = this._getChildLevels(this.helper),
-        previousItem = this.placeholder[0].previousSibling ? $(this.placeholder[0].previousSibling) : null;
-
-      if (previousItem != null) {
-        while (previousItem[0].nodeName.toLowerCase() != 'li' || previousItem[0] == this.currentItem[0]) {
-          if (previousItem[0].previousSibling) {
-            previousItem = $(previousItem[0].previousSibling);
-          } else {
-            previousItem = null;
+            nextItem = null;
             break;
           }
         }
       }
 
-      newList = document.createElement(o.listType);
-
-      this.beyondMaxLevels = 0;
-
-      // If the item is moved to the left, send it to its parent level
-      if (parentItem != null && this.positionAbs.left < parentItem.offset().left) {
-        parentItem.after(this.placeholder[0]);
-        this._clearEmpty(parentItem[0]);
-        this._trigger("change", event, this._uiHash());
-      }
-      // If the item is below another one and is moved to the right, make it a children of it
-      else if (previousItem != null && this.positionAbs.left > previousItem.offset().left + o.tabSize) {
-        this._isAllowed(previousItem, level + childLevels + 1);
-        if (!previousItem.children(o.listType).length) {
-          previousItem[0].appendChild(newList);
-        }
-        previousItem.children(o.listType)[0].appendChild(this.placeholder[0]);
-        this._trigger("change", event, this._uiHash());
-      }
-      else {
-        this._isAllowed(parentItem, level + childLevels);
-      }
-
-      //Post events to containers
-      this._contactContainers(event);
-
-      //Interconnect with droppables
-      if ($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
-
-      //Call callbacks
-      this._trigger('sort', event, this._uiHash());
-
-      this.lastPositionAbs = this.positionAbs;
-      return false;
-
-    },
-
-    _mouseStop:function (event, noPropagation) {
-
-      // If the item is in a position not allowed, send it back
-      if (this.beyondMaxLevels) {
-
-        this.placeholder.removeClass(this.options.errorClass);
-
-        if (this.options.revertOnError) {
-          if (this.domPosition.prev) {
-            $(this.domPosition.prev).after(this.placeholder);
-          } else {
-            $(this.domPosition.parent).prepend(this.placeholder);
-          }
-          this._trigger("revert", event, this._uiHash());
-        } else {
-          var parent = this.placeholder.parent().closest(this.options.items);
-
-          for (var i = this.beyondMaxLevels - 1; i > 0; i--) {
-            parent = parent.parent().closest(this.options.items);
-          }
-
-          parent.after(this.placeholder);
-          this._trigger("change", event, this._uiHash());
+			var newList = document.createElement(o.listType);
+
+			this.beyondMaxLevels = 0;
+			
+			// If the item is moved to the left, send it to its parent's level unless there are siblings below it.
+			if (parentItem != null && nextItem == null &&
+					(o.rtl && (this.positionAbs.left + this.helper.outerWidth() > parentItem.offset().left + parentItem.outerWidth()) ||
+					!o.rtl && (this.positionAbs.left < parentItem.offset().left))) {
+				parentItem.after(this.placeholder[0]);
+				this._clearEmpty(parentItem[0]);
+				this._trigger("change", event, this._uiHash());
+			}
+			// If the item is below a sibling and is moved to the right, make it a child of that sibling.
+			else if (previousItem != null &&
+						(o.rtl && (this.positionAbs.left + this.helper.outerWidth() < previousItem.offset().left + previousItem.outerWidth() - o.tabSize) ||
+						!o.rtl && (this.positionAbs.left > previousItem.offset().left + o.tabSize))) {
+				this._isAllowed(previousItem, level, level+childLevels+1);
+				if (!previousItem.children(o.listType).length) {
+					previousItem[0].appendChild(newList);
+				}
+        // If this item is being moved from the top, add it to the top of the list.
+        if (previousTopOffset && (previousTopOffset <= previousItem.offset().top)) {
+          previousItem.children(o.listType).prepend(this.placeholder);
         }
-
-      }
-
-      // Clean last empty ul/ol
-      for (var i = this.items.length - 1; i >= 0; i--) {
-        var item = this.items[i].item[0];
-        this._clearEmpty(item);
-      }
-
-      $.ui.sortable.prototype._mouseStop.apply(this, arguments);
-
-    },
-
-    serialize:function (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 || (/(.+)[-=_](.+)/)),
-          pid = ($(o.item || this).parent(o.listType)
-            .parent('li')
-            .attr(o.attribute || 'id') || '')
-            .match(o.expression || (/(.+)[-=_](.+)/));
-
-        if (res) {
-          str.push((o.key || res[1] + '[' + (o.key && o.expression ? res[1] : res[2]) + ']')
-            + '='
-            + (pid ? (o.key && o.expression ? pid[1] : pid[2]) : 'root'));
+        // Otherwise, add it to the bottom of the list.
+        else {
+				  previousItem.children(o.listType)[0].appendChild(this.placeholder[0]);
         }
-      });
+				this._trigger("change", event, this._uiHash());
+			}
+			else {
+				this._isAllowed(parentItem, level, level+childLevels);
+			}
 
-      if (!str.length && o.key) {
-        str.push(o.key + '=');
-      }
+			//Post events to containers
+			this._contactContainers(event);
 
-      return str.join('&');
+			//Interconnect with droppables
+			if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
 
-    },
+			//Call callbacks
+			this._trigger('sort', event, this._uiHash());
 
-    toHierarchy:function (o) {
+			this.lastPositionAbs = this.positionAbs;
+			return false;
 
-      o = o || {};
-      var sDepth = o.startDepthCount || 0,
-        ret = [];
+		},
 
-      $(this.element).children('li').each(function () {
-        var level = _recursiveItems($(this));
-        ret.push(level);
-      });
+		_mouseStop: function(event, noPropagation) {
 
-      return ret;
+			// If the item is in a position not allowed, send it back
+			if (this.beyondMaxLevels) {
 
-      function _recursiveItems(li) {
-        var id = ($(li).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+				this.placeholder.removeClass(this.options.errorClass);
 
-        var restricted = $(li).data("restricted");
-        var slug = $(li).data("slug");
-        var external = $(li).data("external");
-        var visible = $(li).data("visible");
+				if (this.domPosition.prev) {
+					$(this.domPosition.prev).after(this.placeholder);
+				} else {
+					$(this.domPosition.parent).prepend(this.placeholder);
+				}
 
-        if (id) {
-          var item = {"id": id[2], "slug": slug, "restricted": restricted, "external": external, "visible": visible};
-          if ($(li).children(o.listType).children('li').length > 0) {
-            item.children = [];
-            $(li).children(o.listType).children('li').each(function () {
-              var level = _recursiveItems($(this));
-              item.children.push(level);
-            });
-          }
-          return item;
-        }
-      }
-    },
-
-    toArray:function (o) {
-
-      o = o || {};
-      var sDepth = o.startDepthCount || 0,
-        ret = [],
-        left = 2;
+				this._trigger("revert", event, this._uiHash());
 
-      ret.push({
-        "item_id":'root',
-        "parent_id":'none',
-        "depth":sDepth,
-        "left":'1',
-        "right":($('li', this.element).length + 1) * 2
-      });
+			}
 
-      $(this.element).children('li').each(function () {
-        left = _recursiveArray(this, sDepth + 1, left);
-      });
+			// Clean last empty ul/ol
+			for (var i = this.items.length - 1; i >= 0; i--) {
+				var item = this.items[i].item[0];
+				this._clearEmpty(item);
+			}
 
-      ret = ret.sort(function (a, b) {
-        return (a.left - b.left);
-      });
+			$.ui.sortable.prototype._mouseStop.apply(this, arguments);
 
-      return ret;
+		},
 
-      function _recursiveArray(item, depth, left) {
+		serialize: function(options) {
 
-        var right = left + 1,
-          id,
-          pid;
+			var o = $.extend({}, this.options, options),
+				items = this._getItemsAsjQuery(o && o.connected),
+			    str = [];
+
+			$(items).each(function() {
+				var res = ($(o.item || this).attr(o.attribute || 'id') || '')
+						.match(o.expression || (/(.+)[-=_](.+)/)),
+				    pid = ($(o.item || this).parent(o.listType)
+						.parent(o.items)
+						.attr(o.attribute || 'id') || '')
+						.match(o.expression || (/(.+)[-=_](.+)/));
+
+				if (res) {
+					str.push(((o.key || res[1]) + '[' + (o.key && o.expression ? res[1] : res[2]) + ']')
+						+ '='
+						+ (pid ? (o.key && o.expression ? pid[1] : pid[2]) : o.rootID));
+				}
+			});
 
-        if ($(item).children(o.listType).children('li').length > 0) {
-          depth++;
-          $(item).children(o.listType).children('li').each(function () {
-            right = _recursiveArray($(this), depth, right);
-          });
-          depth--;
-        }
+			if(!str.length && o.key) {
+				str.push(o.key + '=');
+			}
 
-        id = ($(item).attr(o.attribute || 'id')).match(o.expression || (/(.+)[-=_](.+)/));
+			return str.join('&');
 
-        if (depth === sDepth + 1) {
-          pid = 'root';
-        } else {
-          var parentItem = ($(item).parent(o.listType)
-            .parent('li')
-            .attr(o.attribute || 'id'))
-            .match(o.expression || (/(.+)[-=_](.+)/));
-          pid = parentItem[2];
-        }
+		},
 
-        if (id) {
-          ret.push({"item_id":id[2], "parent_id":pid, "depth":depth, "left":left, "right":right});
-        }
+		toHierarchy: function(options) {
 
-        left = right + 1;
-        return left;
-      }
+			var o = $.extend({}, this.options, options),
+				sDepth = o.startDepthCount || 0,
+			    ret = [];
 
-    },
+			$(this.element).children(o.items).each(function () {
+				var level = _recursiveItems(this);
+				ret.push(level);
+			});
 
-    _clearEmpty:function (item) {
+			return ret;
 
-      var emptyList = $(item).children(this.options.listType);
-      if (emptyList.length && !emptyList.children().length) {
-        emptyList.remove();
-      }
+			function _recursiveItems(item) {
+				var id = ($(item).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+				if (id) {
+					var currentItem = {"id" : id[2]};
+					if ($(item).children(o.listType).children(o.items).length > 0) {
+						currentItem.children = [];
+						$(item).children(o.listType).children(o.items).each(function() {
+							var level = _recursiveItems(this);
+							currentItem.children.push(level);
+						});
+					}
+					return currentItem;
+				}
+			}
+		},
 
-    },
-
-    _getLevel:function (item) {
-
-      var level = 1;
-
-      if (this.options.listType) {
-        var list = item.closest(this.options.listType);
-        while (!list.is('.ui-sortable')) {
-          level++;
-          list = list.parent().closest(this.options.listType);
-        }
-      }
-
-      return level;
-    },
-
-    _getChildLevels:function (parent, depth) {
-      var self = this,
-        o = this.options,
-        result = 0;
-      depth = depth || 0;
-
-      $(parent).children(o.listType).children(o.items).each(function (index, child) {
-        result = Math.max(self._getChildLevels(child, depth + 1), result);
-      });
-
-      return depth ? result + 1 : result;
-    },
-
-    _isAllowed:function (parentItem, levels) {
-      var o = this.options;
-      // Are we trying to nest under a no-nest or are we nesting too deep?
-      if (parentItem == null || !(parentItem.hasClass(o.disableNesting))) {
-        if (o.maxLevels < levels && o.maxLevels != 0) {
-          this.placeholder.addClass(o.errorClass);
-          this.beyondMaxLevels = levels - o.maxLevels;
-        } else {
-          this.placeholder.removeClass(o.errorClass);
-          this.beyondMaxLevels = 0;
-        }
-      } else {
-        this.placeholder.addClass(o.errorClass);
-        if (o.maxLevels < levels && o.maxLevels != 0) {
-          this.beyondMaxLevels = levels - o.maxLevels;
-        } else {
-          this.beyondMaxLevels = 1;
-        }
-      }
-    }
+		toArray: function(options) {
 
-  }));
+			var o = $.extend({}, this.options, options),
+				sDepth = o.startDepthCount || 0,
+			    ret = [],
+			    left = 2;
 
-  $.ui.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.ui.nestedSortable.prototype.options);
+			ret.push({
+				"item_id": o.rootID,
+				"parent_id": 'none',
+				"depth": sDepth,
+				"left": '1',
+				"right": ($(o.items, this.element).length + 1) * 2
+			});
+
+			$(this.element).children(o.items).each(function () {
+				left = _recursiveArray(this, sDepth + 1, left);
+			});
+
+			ret = ret.sort(function(a,b){ return (a.left - b.left); });
+
+			return ret;
+
+			function _recursiveArray(item, depth, left) {
+
+				var right = left + 1,
+				    id,
+				    pid;
+
+				if ($(item).children(o.listType).children(o.items).length > 0) {
+					depth ++;
+					$(item).children(o.listType).children(o.items).each(function () {
+						right = _recursiveArray($(this), depth, right);
+					});
+					depth --;
+				}
+
+				id = ($(item).attr(o.attribute || 'id')).match(o.expression || (/(.+)[-=_](.+)/));
+
+				if (depth === sDepth + 1) {
+					pid = o.rootID;
+				} else {
+					var parentItem = ($(item).parent(o.listType)
+											 .parent(o.items)
+											 .attr(o.attribute || 'id'))
+											 .match(o.expression || (/(.+)[-=_](.+)/));
+					pid = parentItem[2];
+				}
+
+				if (id) {
+						ret.push({"item_id": id[2], "parent_id": pid, "depth": depth, "left": left, "right": right});
+				}
+
+				left = right + 1;
+				return left;
+			}
+
+		},
+
+		_clearEmpty: function(item) {
+
+			var emptyList = $(item).children(this.options.listType);
+			if (emptyList.length && !emptyList.children().length && !this.options.doNotClear) {
+				emptyList.remove();
+			}
+
+		},
+
+		_getLevel: function(item) {
+
+			var level = 1;
+
+			if (this.options.listType) {
+				var list = item.closest(this.options.listType);
+				while (list && list.length > 0 && 
+                    	!list.is('.ui-sortable')) {
+					level++;
+					list = list.parent().closest(this.options.listType);
+				}
+			}
+
+			return level;
+		},
+
+		_getChildLevels: function(parent, depth) {
+			var self = this,
+			    o = this.options,
+			    result = 0;
+			depth = depth || 0;
+
+			$(parent).children(o.listType).children(o.items).each(function (index, child) {
+					result = Math.max(self._getChildLevels(child, depth + 1), result);
+			});
+
+			return depth ? result + 1 : result;
+		},
+
+		_isAllowed: function(parentItem, level, levels) {
+			var o = this.options,
+				isRoot = $(this.domPosition.parent).hasClass('ui-sortable') ? true : false,
+				maxLevels = this.placeholder.closest('.ui-sortable').nestedSortable('option', 'maxLevels'); // this takes into account the maxLevels set to the recipient list
+
+			// Is the root protected?
+			// Are we trying to nest under a no-nest?
+			// Are we nesting too deep?
+			if (!o.isAllowed(this.currentItem, parentItem) ||
+				parentItem && parentItem.hasClass(o.disableNesting) ||
+				o.protectRoot && (parentItem == null && !isRoot || isRoot && level > 1)) {
+					this.placeholder.addClass(o.errorClass);
+					if (maxLevels < levels && maxLevels != 0) {
+						this.beyondMaxLevels = levels - maxLevels;
+					} else {
+						this.beyondMaxLevels = 1;
+					}
+			} else {
+				if (maxLevels < levels && maxLevels != 0) {
+					this.placeholder.addClass(o.errorClass);
+					this.beyondMaxLevels = levels - maxLevels;
+				} else {
+					this.placeholder.removeClass(o.errorClass);
+					this.beyondMaxLevels = 0;
+				}
+			}
+		}
+
+	}));
+
+	$.mjs.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.mjs.nestedSortable.prototype.options);
 })(jQuery);