Neaten comment header. Copied merged changes through to example code. Updated example code to demonstrate new functionality.

master
Wes 2012-02-28 09:28:18 +00:00
parent d92c649909
commit 9763085df2
3 changed files with 249 additions and 222 deletions

View File

@ -47,7 +47,7 @@
<li> <li>
Food Food
<ul> <ul>
<li>Beer</li> <li id="beer">Beer</li>
<li>Vegetables <li>Vegetables
<ul> <ul>
<li>Pumpkin</li> <li>Pumpkin</li>
@ -57,7 +57,7 @@
</li> </li>
</ul> </ul>
</li> </li>
<li>Fruit <li class="fruit">Fruit
<ul> <ul>
<li>Apple <li>Apple
<ul> <ul>

View File

@ -1,238 +1,267 @@
/** /**
* jQuery org-chart/tree plugin. * jQuery org-chart/tree plugin.
* *
* Author: Wes Nolte * Author: Wes Nolte
* http://twitter.com/wesnolte * http://twitter.com/wesnolte
* *
* Based on the work of Mark Lee * Based on the work of Mark Lee
* http://www.capricasoftware.co.uk * http://www.capricasoftware.co.uk
* *
* This software is licensed under the Creative Commons Attribution-ShareAlike * ID implementation fixed by Adrian Hinz
* 3.0 License. *
* * This software is licensed under the Creative Commons Attribution-ShareAlike
* See here for license terms: * 3.0 License.
* http://creativecommons.org/licenses/by-sa/3.0 *
*/ * See here for license terms:
* http://creativecommons.org/licenses/by-sa/3.0
*/
(function($) { (function($) {
$.fn.jOrgChart = function(options) { $.fn.jOrgChart = function(options) {
var opts = $.extend({}, $.fn.jOrgChart.defaults, options); var opts = $.extend({}, $.fn.jOrgChart.defaults, options);
var $appendTo = $(opts.chartElement); var $appendTo = $(opts.chartElement);
// build the tree // build the tree
$this = $(this); $this = $(this);
var $container = $("<div class='" + opts.chartClass + "'/>"); var $container = $("<div class='" + opts.chartClass + "'/>");
if($this.is("ul")) { if($this.is("ul")) {
buildNode($this.find("li:first"), $container, 0, opts); buildNode($this.find("li:first"), $container, 0, opts);
} }
else if($this.is("li")) { else if($this.is("li")) {
buildNode($this, $container, 0, opts); buildNode($this, $container, 0, opts);
} }
$appendTo.append($container); $appendTo.append($container);
// add drag and drop if enabled // add drag and drop if enabled
if(opts.dragAndDrop){ if(opts.dragAndDrop){
$('div.node').draggable({ $('div.node').draggable({
cursor : 'move', cursor : 'move',
distance : 40, distance : 40,
helper : 'clone', helper : 'clone',
opacity : 0.8, opacity : 0.8,
revert : true, revert : true,
revertDuration : 100, revertDuration : 100,
snap : 'div.node.expanded', snap : 'div.node.expanded',
snapMode : 'inner', snapMode : 'inner',
stack : 'div.node' stack : 'div.node'
}); });
$('div.node').droppable({
accept : '.node',
activeClass : 'drag-active',
hoverClass : 'drop-hover'
});
// Drag start event handler for nodes
$('div.node').bind("dragstart", function handleDragStart( event, ui ){
var sourceNode = $(this);
sourceNode.parentsUntil('.node-container')
.find('*')
.filter('.node')
.droppable('disable');
});
// Drag stop event handler for nodes $('div.node').droppable({
$('div.node').bind("dragstop", function handleDragStop( event, ui ){ accept : '.node',
activeClass : 'drag-active',
hoverClass : 'drop-hover'
});
/* reload the plugin */ // Drag start event handler for nodes
$(opts.chartElement).children().remove(); $('div.node').bind("dragstart", function handleDragStart( event, ui ){
$this.jOrgChart(opts);
});
// Drop event handler for nodes
$('div.node').bind("drop", function handleDropEvent( event, ui ) {
var sourceNode = ui.draggable;
var targetNode = $(this);
// finding nodes based on plaintext and html
// content is hard!
var targetLi = $('li').filter(function(){
li = $(this).clone()
.children("ul,li")
.remove()
.end();
return li.html() == targetNode.html();
});
var sourceLi = $('li').filter(function(){
li = $(this).clone()
.children("ul,li")
.remove()
.end();
return li.html() == sourceNode.html();
});
var sourceliClone = sourceLi.clone();
var sourceUl = sourceLi.parent('ul');
if(sourceUl.children('li').size() > 1){
sourceLi.remove();
}else{
sourceUl.remove();
}
if(targetLi.children('ul').size() >0){
targetLi.children('ul').append('<li>'+sourceliClone.html()+'</li>');
}else{
targetLi.append('<ul><li>'+sourceliClone.html()+'</li></ul>');
}
}); // handleDropEvent
} // Drag and drop
};
// Option defaults var sourceNode = $(this);
$.fn.jOrgChart.defaults = { sourceNode.parentsUntil('.node-container')
chartElement : 'body', .find('*')
depth : -1, .filter('.node')
chartClass : "jOrgChart", .droppable('disable');
dragAndDrop: false });
};
// Method that recursively builds the tree // Drag stop event handler for nodes
function buildNode($node, $appendTo, level, opts) { $('div.node').bind("dragstop", function handleDragStop( event, ui ){
var $table = $("<table cellpadding='0' cellspacing='0' border='0'/>");
var $tbody = $("<tbody/>");
// Construct the node container(s) /* reload the plugin */
var $nodeRow = $("<tr/>").addClass("node-cells"); $(opts.chartElement).children().remove();
var $nodeCell = $("<td/>").addClass("node-cell").attr("colspan", 2); $this.jOrgChart(opts);
var $childNodes = $node.children("ul:first").children("li"); });
var $nodeDiv;
if($childNodes.length > 1) {
$nodeCell.attr("colspan", $childNodes.length * 2);
}
// Draw the node
// Get the contents - any markup except li and ul allowed
var $nodeContent = $node.clone()
.children("ul,li")
.remove()
.end()
.html();
$nodeDiv = $("<div>").addClass("node").append($nodeContent);
// Expand and contract nodes // Drop event handler for nodes
if ($childNodes.length > 0) { $('div.node').bind("drop", function handleDropEvent( event, ui ) {
$nodeDiv.click(function() { var sourceNode = ui.draggable;
var $this = $(this); var targetNode = $(this);
var $tr = $this.closest("tr");
$tr.nextAll("tr").fadeToggle("fast");
if($tr.hasClass('contracted')){ // finding nodes based on plaintext and html
$this.css('cursor','n-resize'); // content is hard!
$tr.removeClass('contracted'); var targetLi = $('li').filter(function(){
$tr.addClass('expanded');
}else{
$this.css('cursor','s-resize');
$tr.removeClass('expanded');
$tr.addClass('contracted');
}
});
}
$nodeCell.append($nodeDiv);
$nodeRow.append($nodeCell);
$tbody.append($nodeRow);
if($childNodes.length > 0) { li = $(this).clone()
// if it can be expanded then change the cursor .children("ul,li")
$nodeDiv.css('cursor','n-resize').addClass('expanded'); .remove()
.end();
// recurse until leaves found (-1) or to the level specified var attr = li.attr('id');
if(opts.depth == -1 || (level+1 < opts.depth)) { if (typeof attr !== 'undefined' && attr !== false) {
var $downLineRow = $("<tr/>"); return li.attr("id") == targetNode.attr("id");
var $downLineCell = $("<td/>").attr("colspan", $childNodes.length*2); }
$downLineRow.append($downLineCell); else {
return li.html() == targetNode.html();
}
});
var sourceLi = $('li').filter(function(){
li = $(this).clone()
.children("ul,li")
.remove()
.end();
var attr = li.attr('id');
if (typeof attr !== 'undefined' && attr !== false) {
return li.attr("id") == sourceNode.attr("id");
}
else {
return li.html() == sourceNode.html();
}
});
var sourceliClone = sourceLi.clone();
var sourceUl = sourceLi.parent('ul');
if(sourceUl.children('li').size() > 1){
sourceLi.remove();
}else{
sourceUl.remove();
}
var id = sourceLi.attr("id");
if(targetLi.children('ul').size() >0){
if (typeof id !== 'undefined' && id !== false) {
targetLi.children('ul').append('<li id="'+id+'">'+sourceliClone.html()+'</li>');
}else{
targetLi.children('ul').append('<li>'+sourceliClone.html()+'</li>');
}
}else{
if (typeof id !== 'undefined' && id !== false) {
targetLi.append('<ul><li id="'+id+'">'+sourceliClone.html()+'</li></ul>');
}else{
targetLi.append('<ul><li>'+sourceliClone.html()+'</li></ul>');
}
}
}); // handleDropEvent
} // Drag and drop
};
// Option defaults
$.fn.jOrgChart.defaults = {
chartElement : 'body',
depth : -1,
chartClass : "jOrgChart",
dragAndDrop: false
};
// Method that recursively builds the tree
function buildNode($node, $appendTo, level, opts) {
var $table = $("<table cellpadding='0' cellspacing='0' border='0'/>");
var $tbody = $("<tbody/>");
// Construct the node container(s)
var $nodeRow = $("<tr/>").addClass("node-cells");
var $nodeCell = $("<td/>").addClass("node-cell").attr("colspan", 2);
var $childNodes = $node.children("ul:first").children("li");
var $nodeDiv;
if($childNodes.length > 1) {
$nodeCell.attr("colspan", $childNodes.length * 2);
}
// Draw the node
// Get the contents - any markup except li and ul allowed
var $nodeContent = $node.clone()
.children("ul,li")
.remove()
.end()
.html();
var new_node_id = $node.attr("id")
if (typeof new_node_id !== 'undefined' && new_node_id !== false) {
$nodeDiv = $("<div>").addClass("node").attr("id", $node.attr("id")).append($nodeContent);
}else{
$nodeDiv = $("<div>").addClass("node").append($nodeContent);
}
// Expand and contract nodes
if ($childNodes.length > 0) {
$nodeDiv.click(function() {
var $this = $(this);
var $tr = $this.closest("tr");
$tr.nextAll("tr").fadeToggle("fast");
if($tr.hasClass('contracted')){
$this.css('cursor','n-resize');
$tr.removeClass('contracted');
$tr.addClass('expanded');
}else{
$this.css('cursor','s-resize');
$tr.removeClass('expanded');
$tr.addClass('contracted');
}
});
}
$nodeCell.append($nodeDiv);
$nodeRow.append($nodeCell);
$tbody.append($nodeRow);
if($childNodes.length > 0) {
// if it can be expanded then change the cursor
$nodeDiv.css('cursor','n-resize').addClass('expanded');
// recurse until leaves found (-1) or to the level specified
if(opts.depth == -1 || (level+1 < opts.depth)) {
var $downLineRow = $("<tr/>");
var $downLineCell = $("<td/>").attr("colspan", $childNodes.length*2);
$downLineRow.append($downLineCell);
// draw the connecting line from the parent node to the horizontal line // draw the connecting line from the parent node to the horizontal line
$downLine = $("<div></div>").addClass("line down"); $downLine = $("<div></div>").addClass("line down");
$downLineCell.append($downLine); $downLineCell.append($downLine);
$tbody.append($downLineRow); $tbody.append($downLineRow);
// Draw the horizontal lines // Draw the horizontal lines
var $linesRow = $("<tr/>"); var $linesRow = $("<tr/>");
$childNodes.each(function() { $childNodes.each(function() {
var $left = $("<td>&nbsp;</td>").addClass("line left top"); var $left = $("<td>&nbsp;</td>").addClass("line left top");
var $right = $("<td>&nbsp;</td>").addClass("line right top"); var $right = $("<td>&nbsp;</td>").addClass("line right top");
$linesRow.append($left).append($right); $linesRow.append($left).append($right);
}); });
// horizontal line shouldn't extend beyond the first and last child branches // horizontal line shouldn't extend beyond the first and last child branches
$linesRow.find("td:first") $linesRow.find("td:first")
.removeClass("top") .removeClass("top")
.end() .end()
.find("td:last") .find("td:last")
.removeClass("top"); .removeClass("top");
$tbody.append($linesRow); $tbody.append($linesRow);
var $childNodesRow = $("<tr/>"); var $childNodesRow = $("<tr/>");
$childNodes.each(function() { $childNodes.each(function() {
var $td = $("<td class='node-container'/>"); var $td = $("<td class='node-container'/>");
$td.attr("colspan", 2); $td.attr("colspan", 2);
// recurse through children lists and items // recurse through children lists and items
buildNode($(this), $td, level+1, opts); buildNode($(this), $td, level+1, opts);
$childNodesRow.append($td); $childNodesRow.append($td);
}); });
}
$tbody.append($childNodesRow);
}
// any classes on the LI element get copied to the relevant node in the tree
// apart from the special 'collapsed' class, which collapses the sub-tree at this point
if ($node.attr('class') != undefined) {
var classList = $node.attr('class').split(/\s+/);
$.each(classList, function(index,item) {
if (item == 'collapsed') {
$nodeRow.nextAll('tr').css('display', 'none');
$nodeRow.removeClass('expanded');
$nodeRow.addClass('contracted');
$nodeDiv.css('cursor','s-resize');
} else {
$nodeDiv.addClass(item);
} }
}); $tbody.append($childNodesRow);
} }
$table.append($tbody); // any classes on the LI element get copied to the relevant node in the tree
$appendTo.append($table); // apart from the special 'collapsed' class, which collapses the sub-tree at this point
}; if ($node.attr('class') != undefined) {
var classList = $node.attr('class').split(/\s+/);
$.each(classList, function(index,item) {
if (item == 'collapsed') {
$nodeRow.nextAll('tr').css('display', 'none');
$nodeRow.removeClass('expanded');
$nodeRow.addClass('contracted');
$nodeDiv.css('cursor','s-resize');
} else {
$nodeDiv.addClass(item);
}
});
}
})(jQuery); $table.append($tbody);
$appendTo.append($table);
};
})(jQuery);

View File

@ -7,9 +7,7 @@
* Based on the work of Mark Lee * Based on the work of Mark Lee
* http://www.capricasoftware.co.uk * http://www.capricasoftware.co.uk
* *
* ID implementation by Aleks Drevenšek * ID implementation fixed by Adrian Hinz
*
* ID implementation fixed(changed) by Adrian Hinz
* *
* This software is licensed under the Creative Commons Attribution-ShareAlike * This software is licensed under the Creative Commons Attribution-ShareAlike
* 3.0 License. * 3.0 License.