rails_admin_nested_set 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b422147f5d8ab7f72b9ed776d80b3bbadd735e43
-  data.tar.gz: 10de4e2b36f5845cab5977bbf83212bdff4852f7
+  metadata.gz: 07d822653283fdabcf97010737971642d53ce49c
+  data.tar.gz: 500b6d9fbbdc6ab8aa2e42dd9d13dcb834ebf242
 SHA512:
-  metadata.gz: ac2352c5aef1f10f25b360af6140c6d51b0dd68bd2c3912ccddd260dc522bf43db8b0e4572e74e95593336b14bdf65438242ab7f1a2865a162712205d5b432d3
-  data.tar.gz: 1d50c1e5bdce39897ca75e98e57cab58a021deaaeba05f803acbe227a9112dc7540934d2eb6ddd0c6c67eeb44cda22ee07f6697ba47d4db80b237c882b2b41d8
+  metadata.gz: 24579546b8cfcba8824ce14337c42258c70c7698b8dd6bc333fed11463c8a3ff46720b4dc5ce48badcc6dfeb1d667e3db52e00922d39d8042e7ea3256776d77f
+  data.tar.gz: 8dc13f099cfc1425ec7dd6fbe89fdc294ea020098b1dbdf64e571435a45b3b0b9a4bd4b3450e98fcf2be2972fee62c2a9b8e338b4ecfe3243cd96d6aa999e9f2

data/app/assets/javascripts/rails_admin/jquery.mjs.nestedSortable.js

@@ -1,161 +1,276 @@
 /*
  * jQuery UI Nested Sortable
- * v 1.3.5 / 21 jun 2012
- * http://mjsarfatti.com/code/nestedSortable
+ * v 2.0 / 29 oct 2012
+ * http://mjsarfatti.com/sandbox/nestedSortable
  *
  * Depends on:
- *	 jquery.ui.sortable.js 1.8+
+ *   jquery.ui.sortable.js 1.10+
  *
- * Copyright (c) 2010-2012 Manuele J Sarfatti
+ * Copyright (c) 2010-2013 Manuele J Sarfatti
  * Licensed under the MIT License
  * http://www.opensource.org/licenses/mit-license.php
  */
 
 (function($) {
 
-	$.widget("mjs.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
+  function isOverAxis( x, reference, size ) {
+    return ( x > reference ) && ( x < ( reference + size ) );
+  }
+
+  $.widget("mjs.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
+
+    options: {
+      doNotClear: false,
+      expandOnHover: 700,
+      isAllowed: function(placeholder, placeholderParent, originalItem) { return true; },
+      isTree: false,
+      listType: 'ol',
+      maxLevels: 0,
+      protectRoot: false,
+      rootID: null,
+      rtl: false,
+      startCollapsed: false,
+      tabSize: 20,
+
+      branchClass: 'mjs-nestedSortable-branch',
+      collapsedClass: 'mjs-nestedSortable-collapsed',
+      disableNestingClass: 'mjs-nestedSortable-no-nesting',
+      errorClass: 'mjs-nestedSortable-error',
+      expandedClass: 'mjs-nestedSortable-expanded',
+      hoveringClass: 'mjs-nestedSortable-hovering',
+      leafClass: 'mjs-nestedSortable-leaf'
+    },
+
+    _create: function() {
+      this.element.data('ui-sortable', this.element.data('mjs-nestedSortable'));
+
+      // mjs - prevent browser from freezing if the HTML is not correct
+      if (!this.element.is(this.options.listType))
+        throw new Error('nestedSortable: Please check that the listType option is set to your actual list type');
+
+      // mjs - force 'intersect' tolerance method if we have a tree with expanding/collapsing functionality
+      if (this.options.isTree && this.options.expandOnHover) {
+        this.options.tolerance = 'intersect';
+      }
 
-		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; }
-		},
+      $.ui.sortable.prototype._create.apply(this, arguments);
+
+      // mjs - prepare the tree by applying the right classes (the CSS is responsible for actual hide/show functionality)
+      if (this.options.isTree) {
+        var self = this;
+        $(this.items).each(function() {
+          var $li = this.item;
+          if ($li.children(self.options.listType).length) {
+            $li.addClass(self.options.branchClass);
+            // expand/collapse class only if they have children
+            if (self.options.startCollapsed) $li.addClass(self.options.collapsedClass);
+            else $li.addClass(self.options.expandedClass);
+          } else {
+            $li.addClass(self.options.leafClass);
+          }
+        })
+      }
+    },
+
+    _destroy: function() {
+      this.element
+        .removeData("mjs-nestedSortable")
+        .removeData("ui-sortable");
+      return $.ui.sortable.prototype._destroy.apply(this, arguments);
+    },
+
+    _mouseDrag: function(event) {
+      var i, item, itemElement, intersection,
+        o = this.options,
+        scrolled = false;
+
+      //Compute the helpers position
+      this.position = this._generatePosition(event);
+      this.positionAbs = this._convertPositionTo("absolute");
+
+      if (!this.lastPositionAbs) {
+        this.lastPositionAbs = this.positionAbs;
+      }
 
-		_create: function() {
-			this.element.data('sortable', this.element.data('nestedSortable'));
+      //Do scrolling
+      if(this.options.scroll) {
+        if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
 
-			if (!this.element.is(this.options.listType))
-				throw new Error('nestedSortable: Please check the listType option is set to your actual list type');
+          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;
+          }
 
-			return $.ui.sortable.prototype._create.apply(this, arguments);
-		},
+          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;
+          }
 
-		destroy: function() {
-			this.element
-				.removeData("nestedSortable")
-				.unbind(".nestedSortable");
-			return $.ui.sortable.prototype.destroy.apply(this, arguments);
-		},
+        } else {
 
-		_mouseDrag: function(event) {
+          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);
+          }
 
-			//Compute the helpers position
-			this.position = this._generatePosition(event);
-			this.positionAbs = this._convertPositionTo("absolute");
+          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 (!this.lastPositionAbs) {
-				this.lastPositionAbs = this.positionAbs;
-			}
+        }
 
-			var o = this.options;
+        if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
+          $.ui.ddmanager.prepareOffsets(this, event);
+      }
 
-			//Do scrolling
-			if(this.options.scroll) {
-				var scrolled = false;
-				if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
+      //Regenerate the absolute position used for position checks
+      this.positionAbs = this._convertPositionTo("absolute");
 
-					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;
+      // mjs - find the top offset before rearrangement,
+      var previousTopOffset = this.placeholder.offset().top;
 
-					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;
+      //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";
+      }
 
-				} else {
+      // mjs - check and reset hovering state at each cycle
+      this.hovering = this.hovering ? this.hovering : null;
+      this.mouseentered = this.mouseentered ? this.mouseentered : false;
+
+      // mjs - let's start caching some variables
+      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);
+
+      var newList = document.createElement(o.listType);
+
+      //Rearrange
+      for (i = this.items.length - 1; i >= 0; i--) {
+
+        //Cache variables and intersection, continue if no intersection
+        item = this.items[i];
+        itemElement = item.item[0];
+        intersection = this._intersectsWithPointer(item);
+        if (!intersection) {
+          continue;
+        }
 
-					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);
+        // Only put the placeholder inside the current Container, skip all
+        // items form other containers. This works because when moving
+        // an item from one container to another the
+        // currentContainer is switched before the placeholder is moved.
+        //
+        // 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(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);
+        // 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)
+        ) {
+
+          // mjs - we are intersecting an element: trigger the mouseenter event and store this state
+          if (!this.mouseentered) {
+            $(itemElement).mouseenter();
+            this.mouseentered = true;
+          }
 
-				}
+          // mjs - if the element has children and they are hidden, show them after a delay (CSS responsible)
+          if (o.isTree && $(itemElement).hasClass(o.collapsedClass) && o.expandOnHover) {
+            if (!this.hovering) {
+              $(itemElement).addClass(o.hoveringClass);
+              var self = this;
+              this.hovering = window.setTimeout(function() {
+                $(itemElement).removeClass(o.collapsedClass).addClass(o.expandedClass);
+                self.refreshPositions();
+                self._trigger("expand", event, self._uiHash());
+              }, o.expandOnHover);
+            }
+          }
 
-				if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
-					$.ui.ddmanager.prepareOffsets(this, event);
-			}
+          this.direction = intersection == 1 ? "down" : "up";
+
+          // mjs - rearrange the elements and reset timeouts and hovering state
+          if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
+            $(itemElement).mouseleave();
+            this.mouseentered = false;
+            $(itemElement).removeClass(o.hoveringClass);
+            this.hovering && window.clearTimeout(this.hovering);
+            this.hovering = null;
+
+            // mjs - do not switch container if it's a root item and 'protectRoot' is true
+            // or if it's not a root item but we are trying to make it root
+            if (o.protectRoot
+              && ! (this.currentItem[0].parentNode == this.element[0] // it's a root item
+                  && itemElement.parentNode != this.element[0]) // it's intersecting a non-root item
+            ) {
+              if (this.currentItem[0].parentNode != this.element[0]
+                  && itemElement.parentNode == this.element[0]
+              ) {
+
+                if ( ! $(itemElement).children(o.listType).length) {
+                  itemElement.appendChild(newList);
+                  o.isTree && $(itemElement).removeClass(o.leafClass).addClass(o.branchClass + ' ' + o.expandedClass);
+                }
+
+                var a = this.direction === "down" ? $(itemElement).prev().children(o.listType) : $(itemElement).children(o.listType);
+                if (a[0] !== undefined) {
+                  this._rearrange(event, null, a);
+                }
+
+              } else {
+                this._rearrange(event, item);
+              }
+            } else if ( ! o.protectRoot) {
+              this._rearrange(event, item);
+            }
+          } else {
+            break;
+          }
 
-			//Regenerate the absolute position used for position checks
-			this.positionAbs = this._convertPositionTo("absolute");
+          // Clear emtpy ul's/ol's
+          this._clearEmpty(itemElement);
 
-      // Find the top offset before rearrangement,
-      var previousTopOffset = this.placeholder.offset().top;
+          this._trigger("change", event, this._uiHash());
+          break;
+        }
+      }
 
-			//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.
+      // mjs - 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() != $(o.listType)[0].nodeName.toLowerCase() || previousItem[0] == this.currentItem[0] || previousItem[0] == this.helper[0]) {
+          if (previousItem[0].previousSibling) {
+            previousItem = $(previousItem[0].previousSibling);
+          } else {
+            previousItem = null;
+            break;
+          }
+        }
+      }
+
+      // mjs - 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]) {
+        while (nextItem[0].nodeName.toLowerCase() != $(o.listType)[0].nodeName.toLowerCase() || nextItem[0] == this.currentItem[0] || nextItem[0] == this.helper[0]) {
           if (nextItem[0].nextSibling) {
             nextItem = $(nextItem[0].nextSibling);
           } else {
@@ -165,265 +280,334 @@
         }
       }
 
-			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);
+      this.beyondMaxLevels = 0;
+
+      // mjs - if the item is moved to the left, send it one level up but only if it's at the bottom of the list
+      if (parentItem != null
+        && nextItem == null
+        && ! (o.protectRoot && parentItem[0].parentNode == this.element[0])
+        &&
+          (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]);
+        if (o.isTree && parentItem.children(o.listItem).children(o.listItem + ':visible:not(.ui-sortable-helper)').length < 1) {
+          parentItem.removeClass(this.options.branchClass + ' ' + this.options.expandedClass)
+                .addClass(this.options.leafClass);
+        }
+        this._clearEmpty(parentItem[0]);
+        this._trigger("change", event, this._uiHash());
+      }
+      // mjs - if the item is below a sibling and is moved to the right, make it a child of that sibling
+      else if (previousItem != null
+           && ! previousItem.hasClass(o.disableNestingClass)
+           &&
+            (previousItem.children(o.listType).length && previousItem.children(o.listType).is(':visible')
+             || ! previousItem.children(o.listType).length)
+           && ! (o.protectRoot && this.currentItem[0].parentNode == this.element[0])
+           &&
+            (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);
+          o.isTree && previousItem.removeClass(o.leafClass).addClass(o.branchClass + ' ' + o.expandedClass);
+        }
+
+            // mjs - 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);
+            }
+            // mjs - otherwise, add it to the bottom of the list.
+            else if(previousItem.children(o.listType).length) {
+          previousItem.children(o.listType)[0].appendChild(this.placeholder[0]);
+        }
+
+        this._trigger("change", event, this._uiHash());
+      }
+      else {
+        this._isAllowed(parentItem, level, 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) {
+
+      // mjs - if the item is in a position not allowed, send it back
+      if (this.beyondMaxLevels) {
+
+        this.placeholder.removeClass(this.options.errorClass);
+
+        if (this.domPosition.prev) {
+          $(this.domPosition.prev).after(this.placeholder);
+        } else {
+          $(this.domPosition.parent).prepend(this.placeholder);
         }
-        // Otherwise, add it to the bottom of the list.
-        else {
-				  previousItem.children(o.listType)[0].appendChild(this.placeholder[0]);
+
+        this._trigger("revert", event, this._uiHash());
+
+      }
+
+
+      // mjs - clear the hovering timeout, just to be sure
+      $('.'+this.options.hoveringClass).mouseleave().removeClass(this.options.hoveringClass);
+      this.mouseentered = false;
+      this.hovering && window.clearTimeout(this.hovering);
+      this.hovering = null;
+
+      $.ui.sortable.prototype._mouseStop.apply(this, arguments);
+
+    },
+
+    // mjs - this function is slightly modified to make it easier to hover over a collapsed element and have it expand
+    _intersectsWithSides: function(item) {
+
+      var half = this.options.isTree ? .8 : .5;
+
+      var isOverBottomHalf = isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height*half), item.height),
+        isOverTopHalf = isOverAxis(this.positionAbs.top + this.offset.click.top, item.top - (item.height*half), 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));
+      } else {
+        return verticalDirection && ((verticalDirection == "down" && isOverBottomHalf) || (verticalDirection == "up" && isOverTopHalf));
+      }
+
+    },
+
+    _contactContainers: function(event) {
+
+      if (this.options.protectRoot && this.currentItem[0].parentNode == this.element[0] ) {
+        return;
+      }
+
+      $.ui.sortable.prototype._contactContainers.apply(this, arguments);
+
+    },
+
+    _clear: function(event, noPropagation) {
+
+      $.ui.sortable.prototype._clear.apply(this, arguments);
+
+      // mjs - 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);
+      }
+
+    },
+
+    serialize: function(options) {
+
+      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));
         }
-				this._trigger("change", event, this._uiHash());
-			}
-			else {
-				this._isAllowed(parentItem, level, level+childLevels);
-			}
+      });
+
+      if(!str.length && o.key) {
+        str.push(o.key + '=');
+      }
+
+      return str.join('&');
+
+    },
+
+    toHierarchy: function(options) {
 
-			//Post events to containers
-			this._contactContainers(event);
+      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);
+      });
+
+      return ret;
+
+      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;
+        }
+      }
+    },
+
+    toArray: function(options) {
+
+      var o = $.extend({}, this.options, options),
+        sDepth = o.startDepthCount || 0,
+          ret = [],
+          left = 1;
+
+      if (!o.excludeRoot) {
+        ret.push({
+          "item_id": o.rootID,
+          "parent_id": null,
+          "depth": sDepth,
+          "left": left,
+          "right": ($(o.items, this.element).length + 1) * 2
+        });
+        left++
+      }
 
-			//Interconnect with droppables
-			if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
+      $(this.element).children(o.items).each(function () {
+        left = _recursiveArray(this, sDepth + 1, left);
+      });
 
-			//Call callbacks
-			this._trigger('sort', event, this._uiHash());
+      ret = ret.sort(function(a,b){ return (a.left - b.left); });
 
-			this.lastPositionAbs = this.positionAbs;
-			return false;
+      return ret;
 
-		},
+      function _recursiveArray(item, depth, left) {
 
-		_mouseStop: function(event, noPropagation) {
+        var right = left + 1,
+            id,
+            pid;
 
-			// If the item is in a position not allowed, send it back
-			if (this.beyondMaxLevels) {
+        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 --;
+        }
 
-				this.placeholder.removeClass(this.options.errorClass);
+        id = ($(item).attr(o.attribute || 'id')).match(o.expression || (/(.+)[-=_](.+)/));
 
-				if (this.domPosition.prev) {
-					$(this.domPosition.prev).after(this.placeholder);
-				} else {
-					$(this.domPosition.parent).prepend(this.placeholder);
-				}
+        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];
+        }
 
-				this._trigger("revert", event, this._uiHash());
+        if (id) {
+            ret.push({"item_id": id[2], "parent_id": pid, "depth": depth, "left": left, "right": right});
+        }
 
-			}
+        left = right + 1;
+        return 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);
-			}
+    },
 
-			$.ui.sortable.prototype._mouseStop.apply(this, arguments);
+    _clearEmpty: function(item) {
+      var o = this.options;
 
-		},
+      var emptyList = $(item).children(o.listType);
 
-		serialize: function(options) {
+      if (emptyList.length && !emptyList.children().length && !o.doNotClear) {
+        o.isTree && $(item).removeClass(o.branchClass + ' ' + o.expandedClass).addClass(o.leafClass);
+        emptyList.remove();
+      } else if (o.isTree && emptyList.length && emptyList.children().length && emptyList.is(':visible')) {
+        $(item).removeClass(o.leafClass).addClass(o.branchClass + ' ' + o.expandedClass);
+      } else if (o.isTree && emptyList.length && emptyList.children().length && !emptyList.is(':visible')) {
+        $(item).removeClass(o.leafClass).addClass(o.branchClass + ' ' + o.collapsedClass);
+      }
 
-			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(!str.length && o.key) {
-				str.push(o.key + '=');
-			}
+    _getLevel: function(item) {
 
-			return str.join('&');
+      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);
+        }
+      }
 
-		toHierarchy: function(options) {
+      return level;
+    },
 
-			var o = $.extend({}, this.options, options),
-				sDepth = o.startDepthCount || 0,
-			    ret = [];
+    _getChildLevels: function(parent, depth) {
+      var self = this,
+          o = this.options,
+          result = 0;
+      depth = depth || 0;
 
-			$(this.element).children(o.items).each(function () {
-				var level = _recursiveItems(this);
-				ret.push(level);
-			});
+      $(parent).children(o.listType).children(o.items).each(function (index, child) {
+          result = Math.max(self._getChildLevels(child, depth + 1), result);
+      });
 
-			return ret;
+      return depth ? result + 1 : result;
+    },
 
-			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;
-				}
-			}
-		},
+    _isAllowed: function(parentItem, level, levels) {
+      var o = this.options,
+        maxLevels = this.placeholder.closest('.ui-sortable').nestedSortable('option', 'maxLevels'); // this takes into account the maxLevels set to the recipient list
 
-		toArray: function(options) {
+      // mjs - is the root protected?
+      // mjs - are we nesting too deep?
+      if ( ! o.isAllowed(this.placeholder, parentItem, this.currentItem)) {
+          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;
+        }
+      }
+    }
 
-			var o = $.extend({}, this.options, options),
-				sDepth = o.startDepthCount || 0,
-			    ret = [],
-			    left = 2;
+  }));
 
-			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);
+  $.mjs.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.mjs.nestedSortable.prototype.options);
 })(jQuery);

data/app/assets/javascripts/rails_admin/rails_admin_nested_set.js.coffee

@@ -11,14 +11,13 @@ window.rails_admin_nested_set = (tree_config) ->
 
   $ ->
     $("#" + tree_config["id"]).nestedSortable
-      forcePlaceholderSize: true
-      # handle: 'i.dd-handle',
-      helper: "clone"
-      items: "li"
+      handle: '.dd-handle',
+      #helper: "clone"
+      items: ".dd-item"
       maxLevels: tree_config["max_depth"]
-      opacity: .6
       placeholder: "dd-placeholder"
-      tabSize: 25
+      tolerance: 'pointer',
+      toleranceElement: '> div',
       update: (event, ui) ->
         $.ajax
           type: "POST"

data/app/assets/stylesheets/rails_admin/rails_admin_nested_set.css.scss

@@ -25,13 +25,7 @@
   padding-left: 30px;
 }
 
-.dd-collapsed ol {
-  display: none;
-}
-
-.dd-item,
-.dd-empty,
-.dd-placeholder {
+.dd-item, .dd-placeholder {
   display: block;
   position: relative;
   margin: 0;
@@ -66,146 +60,21 @@
   background: #fff;
 }
 
-.dd-item > button {
-  display: block;
-  position: relative;
-  cursor: pointer;
-  float: left;
-  width: 25px;
-  height: 20px;
-  margin: 5px 0;
-  padding: 0;
-  text-indent: 100%;
-  white-space: nowrap;
-  overflow: hidden;
-  border: 0;
-  background: transparent;
-  font-size: 12px;
-  line-height: 1;
-  text-align: center;
-  font-weight: bold;
+.dd-item {
+  margin-top: 5px
 }
 
-.dd-item > button:before {
-  content: '+';
-  display: block;
-  position: absolute;
-  width: 100%;
-  text-align: center;
-  text-indent: 0;
-}
-
-.dd-item > button[data-action="collapse"]:before {
-  content: '-';
-}
-
-.dd-placeholder, .dd-empty {
+.dd-placeholder {
   margin: 5px 0;
   padding: 0;
   min-height: 30px;
   background: #f2fbff;
   border: 1px dashed #b6bcbf;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-}
-
-.dd-empty {
-  border: 1px dashed #bbb;
-  min-height: 100px;
-  background-color: #e5e5e5;
-  background-image: -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-  background-image: -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-  background-image: linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-  background-size: 60px 60px;
-  background-position: 0 0, 30px 30px;
-}
-
-.dd-dragel {
-  position: absolute;
-  pointer-events: none;
-  z-index: 9999;
-}
-
-.dd-dragel > .dd-item .dd-handle {
-  margin-top: 0;
-}
-
-.dd-dragel .dd-handle {
-  -webkit-box-shadow: 2px 4px 6px 0 rgba(0, 0, 0, .1);
-  box-shadow: 2px 4px 6px 0 rgba(0, 0, 0, .1);
 }
 
-/**
- * Nestable Extras
- */
-
-.nestable-lists {
-  display: block;
-  clear: both;
-  padding: 30px 0;
-  width: 100%;
-  border: 0;
-  border-top: 2px solid #ddd;
-  border-bottom: 2px solid #ddd;
-}
-
-#nestable-menu {
-  padding: 0;
-  margin: 20px 0;
-}
-
-#nestable-output, #nestable2-output {
-  width: 100%;
-  height: 7em;
-  font-size: 0.75em;
-  line-height: 1.333333em;
-  font-family: Consolas, monospace;
-  padding: 5px;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-}
-
-#nestable2 .dd-handle {
-  color: #fff;
-  border: 1px solid #999;
-  background: #bbb;
-  background: -webkit-linear-gradient(top, #bbb 0%, #999 100%);
-  background: -moz-linear-gradient(top, #bbb 0%, #999 100%);
-  background: linear-gradient(top, #bbb 0%, #999 100%);
-}
-
-#nestable2 .dd-handle:hover {
-  background: #bbb;
-}
-
-#nestable2 .dd-item > button:before {
-  color: #fff;
-}
-
-@media only screen and (min-width: 700px) {
-
-  .dd {
-    float: none;
-    width: auto;
-  }
-  .dd + .dd {
-    margin-left: 2%;
-  }
-
-}
-
-.dd-hover > .dd-handle {
-  background: #2ea8e5 !important;
-}
-
-/**
-* Nestable Draggable Handles
-*/
-
 .dd3-content {
   display: block;
   height: 30px;
-  margin: 5px 0;
   padding: 5px 10px 5px 40px;
   color: #333;
   text-decoration: none;

data/lib/rails_admin_nested_set/configuration.rb

@@ -7,7 +7,7 @@ module RailsAdminNestedSet
     def options
       @options ||= {
           max_depth: 3,
-      }.merge(config)
+      }.merge(config || {})
     end
 
     protected

data/lib/rails_admin_nested_set/helper.rb

@@ -15,7 +15,6 @@ module RailsAdminNestedSet
         li_classes = 'dd-item dd3-item'
 
         content_tag :li, class: li_classes, :'data-id' => node.id do
-
           output = content_tag :div, 'drag', class: 'dd-handle dd3-handle'
           output+= content_tag :div, class: 'dd3-content' do
             content = link_to @model_config.with(object: node).object_label, edit_path(@abstract_model, node.id)
@@ -24,7 +23,7 @@ module RailsAdminNestedSet
 
           children = tree.select{|elem| elem.parent_id == node.id}
           if children.any?
-            output += content_tag :ol, rails_admin_nested_set_builder(children, tree), class: 'dd-list'
+            output = content_tag(:div, output) + content_tag(:ol, rails_admin_nested_set_builder(children, tree), class: 'dd-list')
           end
 
           output

data/lib/rails_admin_nested_set/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminNestedSet
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/rails_admin_nested_set.gemspec

@@ -12,10 +12,6 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Interface for editing a nested set for rails_admin}
   gem.homepage      = "https://github.com/rs-pro/rails_admin_nested_set"
 
-  gem.add_dependency "rails", "~> 4.0.0"
-  gem.add_dependency "jquery-rails"
-  gem.add_dependency "jquery-ui-rails"
-
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_nested_set
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2014-02-26 00:00:00.000000000 Z
+dependencies: []
 description: Rails admin nested set
 email:
 - glebtv@gmail.com
@@ -100,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Interface for editing a nested set for rails_admin