refinerycms-core 2.0.10 → 2.1.0

data/app/assets/javascripts/refinery/ajaxy_pagination.js.coffee

@@ -1,7 +1,7 @@
 @init_ajaxy_pagination = ->
   if typeof (window.history.pushState) == "function" and $(".pagination_container").length > 0
     pagination_pages = $(".pagination_container .pagination a")
-    pagination_pages.live "click", (e) ->
+    pagination_pages.on "click", (e) ->
       navigate_to = @href.replace(/(\&(amp\;)?)?from_page\=\d+/, "")
       navigate_to += "&from_page=" + $(".current").text()
       navigate_to = navigate_to.replace("?&", "?").replace(/\s+/, "")

data/app/assets/javascripts/refinery/boot_wym.js.erb

@@ -1,9 +1,5 @@
 onOpenDialog = function(dialog) {
-  (dialog = $('.ui-dialog')).find('.ui-dialog-titlebar').corner('1px top');
-  if(!$.browser.msie){
-    dialog.corner('6px');
-  }
-  if (dialog.height() < $(window).height()) {
+  if ($('.ui-dialog').height() < $(window).height()) {
     if(iframed()) {
       $(parent.document.body).addClass('hide-overflow');
     } else {
@@ -224,7 +220,7 @@ var wymeditor_boot_options = $.extend({
       );
     }
   }
-  , lang: '<%= ::Refinery::i18n_enabled? ? ::Refinery::I18n.current_locale : 'en' %>'
+  , lang: refinery.current_admin_locale
 }, custom_wymeditor_boot_options);
 
 WYMeditor.editor.prototype.loadIframe = function(iframe) {
@@ -252,8 +248,8 @@ WYMeditor.editor.prototype.loadIframe = function(iframe) {
 
     var doc_head = doc.head || $(doc).find('head').get(0);
     $("<link href='<%= asset_path 'wymeditor/skins/refinery/wymiframe.css' %>' media='all' rel='stylesheet' />").appendTo(doc_head);
-    $("<link href='<%= asset_path 'formatting.css' %>' media='all' rel='stylesheet' />").appendTo(doc_head);
-    $("<link href='<%= asset_path 'theme.css' %>' media='all' rel='stylesheet' />").appendTo(doc_head);
+    $("<link href='<%= asset_path 'refinery/formatting.css' %>' media='all' rel='stylesheet' />").appendTo(doc_head);
+    $("<link href='<%= asset_path 'refinery/theme.css' %>' media='all' rel='stylesheet' />").appendTo(doc_head);
   }
   if ((id_of_editor = wym._element.parent().attr('id')) != null) {
     $(doc.body).addClass(id_of_editor);

data/app/assets/javascripts/refinery/core.js

@@ -10,7 +10,7 @@ init_flash_messages = function(){
     'opacity': 0
     , 'visibility':'visible'
   }).animate({'opacity': '1'}, 550);
-  $('#flash_close').live('click', function(e) {
+  $('#flash_close').on('click', function(e) {
     try {
       $('#flash').animate({
          'opacity': 0,

data/app/assets/javascripts/refinery/interface.js.coffee.erb

@@ -1,16 +1,6 @@
 @init_interface = ->
   $("body#dialog_container.dialog").addClass "iframed"  if parent and parent.document.location.href != document.location.href
   $("input:submit:not(.button)").addClass "button"
-  unless $.browser.msie
-    $("#page_container, .wym_box").corner "5px bottom"
-    $(".wym_box").corner "5px tr"
-    $(".field > .wym_box").corner "5px tl"
-    $(".wym_iframe iframe").corner "2px"
-    $(".form-actions:not(\".form-actions-dialog\")").corner "5px"
-  $("#recent_activity li a, #recent_inquiries li a").each (i, a) ->
-    $(this).textTruncate
-      width: $(this).width()
-      tooltip: false
 
   $("textarea.wymeditor").each ->
     textarea = $(this)
@@ -39,10 +29,6 @@
       listTag: $menu.get(0).tagName.toLowerCase()
       itemTag: $menu.children(":first").get(0).tagName.toLowerCase()
 
-    if $menu.outerWidth() < $("#page_container").outerWidth()
-      $("#page_container:not('.login #page_container')").corner "5px tr"
-    else
-      $("#page_container:not('.login #page_container')").uncorner()
   $("#current_locale li a").click (e) ->
     $("#current_locale li a span").each (span) ->
       $(this).css "display", (if $(this).css("display") == "none" then "" else "none")
@@ -55,7 +41,8 @@
     e.preventDefault()
 
   $("#existing_image img").load ->
-    $("form.edit_image .form-actions").css "margin-top": ($("#existing_image").height() - $("form.edit_image").height() + 8)
+    margin_top = ($("#existing_image").height() - $("form.edit_image").height() + 8)
+    $("form.edit_image .form-actions").css "margin-top": margin_top if margin_top > 0
 
   $(".form-actions .form-actions-left input:submit#submit_button").click (e) ->
     $("<img src='<%= asset_path 'refinery/ajax-loader.gif' %>' width='16' height='16' class='save-loader' />").appendTo $(this).parent()
@@ -66,5 +53,5 @@
     titlebar_close_button.trigger('click')
     e.preventDefault()
 
-  $("a.suppress").live "click", (e) ->
+  $("a.suppress").on "click", (e) ->
     e.preventDefault()

data/app/assets/javascripts/refinery/modal_dialogs.js.erb

@@ -14,7 +14,6 @@ init_modal_dialogs = function(){
                    + 'app_dialog=true&dialog=true';
 
       iframe = $("<iframe id='dialog_iframe' frameborder='0' marginheight='0' marginwidth='0' border='0'></iframe>");
-      if(!$.browser.msie) { iframe.corner('8px'); }
       iframe.dialog({
         title: $anchor.data('dialog-title')
         , modal: true
@@ -58,8 +57,6 @@ init_sortable_menu = function(){
   $menu.find('#menu_reorder_done').click(function(e){
     trigger_reordering(e, false);
   });
-
-  $menu.find('> a').corner('top 5px');
 };
 
 trigger_reordering = function(e, enable) {

data/app/assets/javascripts/refinery/nestedsortables.js

@@ -4,7 +4,7 @@
  * http://mjsarfatti.com/sandbox/nestedSortable
  *
  * Depends:
- *   jquery.ui.sortable.js 1.8+
+ *	 jquery.ui.sortable.js 1.8+
  *
  * License CC BY-SA 3.0
  * Copyright 2010-2011, Manuele J Sarfatti
@@ -12,345 +12,345 @@
 
 (function($) {
 
-  $.widget("ui.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
+	$.widget("ui.nestedSortable", $.extend({}, $.ui.sortable.prototype, {
 
-    options: {
-      tabSize: 20,
-      disableNesting: 'ui-nestedSortable-no-nesting',
-      errorClass: 'ui-nestedSortable-error',
-      listType: 'ol',
-      maxLevels: 0,
-      noJumpFix: 0
-    },
-
-    _create: function(){
-      if (this.noJumpFix == false)
-        this.element.height(this.element.height());
-      this.element.data('sortable', this.element.data('nestedSortable'));
-      return $.ui.sortable.prototype._create.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;
-      }
-
-      //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
-        ) {
-
-          this.direction = intersection == 1 ? "down" : "up";
-
-          if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
-            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;
-      var level = this._getLevel(this.placeholder);
-      var childLevels = this._getChildLevels(this.helper);
-      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]) {
-          if (previousItem[0].previousSibling) {
-            previousItem = $(previousItem[0].previousSibling);
-          } else {
-            previousItem = 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) {
-        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);
-        }
-
-        this.placeholder.removeClass(this.options.errorClass);
-        parent.after(this.placeholder);
-        this._trigger("change", event, this._uiHash());
-      }
-
-      $.ui.sortable.prototype._mouseStop.apply(this, arguments);
-
-    },
-
-    serialize: function(o) {
-
-      var items = this._getItemsAsjQuery(o && o.connected);
-      var str = []; o = o || {};
-
-      $(items).each(function() {
-        var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-        var 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'));
-      });
-
-      if(!str.length && o.key) {
-        str.push(o.key + '=');
-      }
-
-      return str.join('&');
-
-    },
-
-    toHierarchy: function(o) {
-
-      o = o || {};
-      var sDepth = o.startDepthCount || 0;
-      var ret = [];
-
-      $(this.element).children('li').each(function() {
-        var level = _recursiveItems($(this));
-        ret.push(level);
-      });
-
-      return ret;
-
-      function _recursiveItems(li) {
-        var id = ($(li).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-        if (id != null) {
-          var item = {"id" : id[2]};
-          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;
-        }
-      }
+		options: {
+			tabSize: 20,
+			disableNesting: 'ui-nestedSortable-no-nesting',
+			errorClass: 'ui-nestedSortable-error',
+			listType: 'ol',
+			maxLevels: 0,
+			noJumpFix: 0
+		},
+
+		_create: function(){
+			if (this.noJumpFix == false)
+				this.element.height(this.element.height());
+			this.element.data('sortable', this.element.data('nestedSortable'));
+			return $.ui.sortable.prototype._create.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;
+			}
+
+			//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
+				) {
+
+					this.direction = intersection == 1 ? "down" : "up";
+
+					if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
+						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;
+			var level = this._getLevel(this.placeholder);
+			var childLevels = this._getChildLevels(this.helper);
+			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]) {
+					if (previousItem[0].previousSibling) {
+						previousItem = $(previousItem[0].previousSibling);
+					} else {
+						previousItem = 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) {
+				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);
+				}
+
+				this.placeholder.removeClass(this.options.errorClass);
+				parent.after(this.placeholder);
+				this._trigger("change", event, this._uiHash());
+			}
+
+			$.ui.sortable.prototype._mouseStop.apply(this, arguments);
+
+		},
+
+		serialize: function(o) {
+
+			var items = this._getItemsAsjQuery(o && o.connected);
+			var str = []; o = o || {};
+
+			$(items).each(function() {
+				var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+				var 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'));
+			});
+
+			if(!str.length && o.key) {
+				str.push(o.key + '=');
+			}
+
+			return str.join('&');
+
+		},
+
+		toHierarchy: function(o) {
+
+			o = o || {};
+			var sDepth = o.startDepthCount || 0;
+			var ret = [];
+
+			$(this.element).children('li').each(function() {
+				var level = _recursiveItems($(this));
+				ret.push(level);
+			});
+
+			return ret;
+
+			function _recursiveItems(li) {
+				var id = ($(li).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+				if (id != null) {
+					var item = {"id" : id[2]};
+					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) {
+		toArray: function(o) {
 
-      o = o || {};
-      var sDepth = o.startDepthCount || 0;
-      var ret = [];
-      var left = 2;
+			o = o || {};
+			var sDepth = o.startDepthCount || 0;
+			var ret = [];
+			var left = 2;
 
-      ret.push({"item_id": 'root', "parent_id": 'none', "depth": sDepth, "left": '1', "right": ($('li', this.element).length + 1) * 2});
+			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);
-      });
+			$(this.element).children('li').each(function () {
+				left = _recursiveArray(this, sDepth + 1, left);
+			});
 
-      function _sortByLeft(a,b) {
-        return a['left'] - b['left'];
-      }
-      ret = ret.sort(_sortByLeft);
+			function _sortByLeft(a,b) {
+				return a['left'] - b['left'];
+			}
+			ret = ret.sort(_sortByLeft);
 
-      return ret;
+			return ret;
 
-      function _recursiveArray(item, depth, left) {
+			function _recursiveArray(item, depth, left) {
 
-        right = left + 1;
+				right = left + 1;
 
-        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 ($(item).children(o.listType).children('li').length > 0) {
+					depth ++;
+					$(item).children(o.listType).children('li').each(function () {
+						right = _recursiveArray($(this), depth, right);
+					});
+					depth --;
+				}
 
-        id = ($(item).attr(o.attribute || 'id')).match(o.expression || (/(.+)[-=_](.+)/));
+				id = ($(item).attr(o.attribute || 'id')).match(o.expression || (/(.+)[-=_](.+)/));
 
-        if (depth === sDepth + 1) pid = 'root';
-        else {
-          parentItem = ($(item).parent(o.listType).parent('li').attr('id')).match(o.expression || (/(.+)[-=_](.+)/));
-          pid = parentItem[2];
-        }
+				if (depth === sDepth + 1) pid = 'root';
+				else {
+					parentItem = ($(item).parent(o.listType).parent('li').attr('id')).match(o.expression || (/(.+)[-=_](.+)/));
+					pid = parentItem[2];
+				}
 
-        if (id != null) {
-            ret.push({"item_id": id[2], "parent_id": pid, "depth": depth, "left": left, "right": right});
-        }
+				if (id != null) {
+						ret.push({"item_id": id[2], "parent_id": pid, "depth": depth, "left": left, "right": right});
+				}
 
-        return left = right + 1;
-      }
+				return left = right + 1;
+			}
 
-    },
+		},
 
-    _clear: function(event, noPropagation) {
+		_clear: function(event, noPropagation) {
 
-      $.ui.sortable.prototype._clear.apply(this, arguments);
+			$.ui.sortable.prototype._clear.apply(this, arguments);
 
-      // 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);
-      }
-      return true;
+			// 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);
+			}
+			return true;
 
-    },
+		},
 
-    _clearEmpty: function(item) {
+		_clearEmpty: function(item) {
 
-      if (item.children[1] && item.children[1].children.length == 0) {
-        item.removeChild(item.children[1]);
-      }
+			if (item.children[1] && item.children[1].children.length == 0) {
+				item.removeChild(item.children[1]);
+			}
 
-    },
+		},
 
-    _getLevel: function(item) {
+		_getLevel: function(item) {
 
-      var level = 1;
+			var level = 1;
 
-      if (this.options.listType) {
-          var list = item.closest(this.options.listType);
-          while (!list.is('.ui-sortable')/* && level < this.options.maxLevels*/) {
-              level++;
-              list = list.parent().closest(this.options.listType);
-          }
-      }
+			if (this.options.listType) {
+					var list = item.closest(this.options.listType);
+					while (!list.is('.ui-sortable')/* && level < this.options.maxLevels*/) {
+							level++;
+							list = list.parent().closest(this.options.listType);
+					}
+			}
 
-      return level;
-    },
+			return level;
+		},
 
-    _getChildLevels: function(parent, depth) {
-      var self = this,
-          o = this.options,
-          result = 0;
-      depth = depth || 0;
+		_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);
-      });
+			$(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;
-    },
+			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;
-        }
-      }
-    }
-
-  }));
-
-  $.ui.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.ui.nestedSortable.prototype.options);
-})(jQuery);
+		_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;
+				}
+			}
+		}
+
+	}));
+
+	$.ui.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.ui.nestedSortable.prototype.options);
+})(jQuery);