@@ -1,5 +1,6 @@ == 2.2.2 - 25 July 2009 * Optimized performance of tree initialization (with initialState is collapsed) +* TODO Added option 'clickableNodeNames' to make entire node name clickable to expand branch * Updated jQuery to version 1.3.2 * Updated jQuery UI components to 1.7.2 (Core, Draggable, Droppable) treeTable/CHANGELOG @@ -209,6 +209,12 @@ $(document).ready(function() { <td>Customize the prefix used for node classes.</td> </tr> <tr> + <td><tt>clickableNodeNames</tt></td> + <td><tt>bool</tt></td> + <td><tt>false</tt></td> + <td>Set to true to expand branches not only when expander icon is clicked but also when node name is clicked.</td> + </tr> + <tr> <td><tt>expandable</tt></td> <td><tt>bool</tt></td> <td><tt>true</tt></td> treeTable/doc/index.html @@ -1,4 +1,4 @@ -/* jQuery treeTable Plugin 2.2.2-dev - http://ludo.cubicphuse.nl/jquery-plugins/treeTable/ */ +/* jQuery treeTable Plugin 2.2.2 - http://ludo.cubicphuse.nl/jquery-plugins/treeTable/ */ (function($) { // Helps to make options available to all functions // TODO: This gives problems when there are both expandable and non-expandable @@ -22,6 +22,7 @@ $.fn.treeTable.defaults = { childPrefix: "child-of-", + clickableNodeNames: false, expandable: true, indent: 19, initialState: "collapsed", @@ -149,7 +150,17 @@ if(options.expandable) { cell.prepend(''); $(cell[0].firstChild).click(function() { node.toggleBranch(); }); - + + if(options.clickableNodeNames) { + $(cell).css('cursor', 'pointer'); + $(cell).click(function(e) { + // Don't double-toggle if the click is on the existing expander icon + if (e.target.className != 'expander') { + node.toggleBranch(); + } + }); + } + // Check for a class set explicitly by the user, otherwise set the default class if(!(node.hasClass("expanded") || node.hasClass("collapsed"))) { node.addClass(options.initialState); treeTable/src/javascripts/jquery.treeTable.js @@ -1,5 +1,5 @@ -/* jQuery treeTable Plugin 2.2.2-dev - http://ludo.cubicphuse.nl/jquery-plugins/treeTable/ */ -(function($){var options;$.fn.treeTable=function(opts){options=$.extend({},$.fn.treeTable.defaults,opts);return this.each(function(){$(this).addClass("treeTable").find("tbody tr").each(function(){if(!options.expandable||$(this)[0].className.search("child-of-")==-1){initialize($(this));}});});};$.fn.treeTable.defaults={childPrefix:"child-of-",drop_location:"top",expandable:true,indent:19,initialState:"collapsed",treeColumn:0};$.fn.collapse=function(){$(this).addClass("collapsed");childrenOf($(this)).each(function(){initialize($(this));if(!$(this).hasClass("collapsed")){$(this).collapse();} +/* jQuery treeTable Plugin 2.2.2 - http://ludo.cubicphuse.nl/jquery-plugins/treeTable/ */ +(function($){var options;$.fn.treeTable=function(opts){options=$.extend({},$.fn.treeTable.defaults,opts);return this.each(function(){$(this).addClass("treeTable").find("tbody tr").each(function(){if(!options.expandable||$(this)[0].className.search("child-of-")==-1){initialize($(this));}else if(options.initialState=="collapsed"){this.style.display="none";}});});};$.fn.treeTable.defaults={childPrefix:"child-of-",clickableNodeNames:false,expandable:true,indent:19,initialState:"collapsed",treeColumn:0};$.fn.collapse=function(){$(this).addClass("collapsed");childrenOf($(this)).each(function(){if(!$(this).hasClass("collapsed")){$(this).collapse();} $(this).hide();});return this;};$.fn.expand=function(){$(this).removeClass("collapsed").addClass("expanded");childrenOf($(this)).each(function(){initialize($(this));if($(this).is(".expanded.parent")){$(this).expand();} $(this).show();});return this;};$.fn.appendBranchTo=function(destination){var node=$(this);var parent=parentOf(node);var ancestorNames=$.map(ancestorsOf($(destination)),function(a){return a.id;});if(options.drop_location=="bottom"){move_to=childrenOf($(destination)).reverse()[0];}else{move_to=destination;} if($.inArray(node[0].id,ancestorNames)==-1&&(!parent||(destination.id!=parent[0].id))&&destination.id!=node[0].id){indent(node,ancestorsOf(node).length*options.indent*-1);if(parent){node.removeClass(options.childPrefix+parent[0].id);} @@ -7,5 +7,6 @@ node.addClass(options.childPrefix+destination.id);indent(node,ancestorsOf(node). return this;};$.fn.reverse=function(){return this.pushStack(this.get().reverse(),arguments);};$.fn.toggleBranch=function(){if($(this).hasClass("collapsed")){$(this).expand();}else{$(this).removeClass("expanded").collapse();} return this;};function ancestorsOf(node){var ancestors=[];while(node=parentOf(node)){ancestors[ancestors.length]=node[0];} return ancestors;};function childrenOf(node){return $("table.treeTable tbody tr."+options.childPrefix+node[0].id);};function indent(node,value){var cell=$(node.children("td")[options.treeColumn]);var padding=parseInt(cell.css("padding-left"),10)+value;cell.css("padding-left",+padding+"px");childrenOf(node).each(function(){indent($(this),value);});};function initialize(node){if(!node.hasClass("initialized")){node.addClass("initialized");var childNodes=childrenOf(node);if(!node.hasClass("parent")&&childNodes.length>0){node.addClass("parent");} -if(node.hasClass("parent")){var cell=$(node.children("td")[options.treeColumn]);var padding=parseInt(cell.css("padding-left"),10)+options.indent;childNodes.each(function(){$($(this).children("td")[options.treeColumn]).css("padding-left",padding+"px");});if(options.expandable){cell.prepend('');$(cell[0].firstChild).click(function(){node.toggleBranch();});if(!(node.hasClass("expanded")||node.hasClass("collapsed"))){node.addClass(options.initialState);} -if(node.hasClass("collapsed")){node.collapse();}else if(node.hasClass("expanded")){node.expand();}}}}};function move(node,destination){node.insertAfter(destination);childrenOf(node).reverse().each(function(){move($(this),node[0]);});};function parentOf(node){var classNames=node[0].className.split(' ');for(key in classNames){if(classNames[key].match("child-of-")){return $("#"+classNames[key].substring(9));}}};})(jQuery); \ No newline at end of file +if(node.hasClass("parent")){var cell=$(node.children("td")[options.treeColumn]);var padding=parseInt(cell.css("padding-left"),10)+options.indent;childNodes.each(function(){$($(this).children("td")[options.treeColumn]).css("padding-left",padding+"px");});if(options.expandable){cell.prepend('');$(cell[0].firstChild).click(function(){node.toggleBranch();});if(options.clickableNodeNames){$(cell).css('cursor','pointer');$(cell).click(function(e){if(e.target.className!='expander'){node.toggleBranch();}});} +if(!(node.hasClass("expanded")||node.hasClass("collapsed"))){node.addClass(options.initialState);} +if(node.hasClass("expanded")){node.expand();}}}}};function move(node,destination){node.insertAfter(destination);childrenOf(node).reverse().each(function(){move($(this),node[0]);});};function parentOf(node){var classNames=node[0].className.split(' ');for(key in classNames){if(classNames[key].match("child-of-")){return $("#"+classNames[key].substring(9));}}};})(jQuery); \ No newline at end of file treeTable/src/javascripts/jquery.treeTable.min.js afb54861fcbd3d9848b94a7db31beed9396c9987 Ludo van den Boom ludo@kabisa.nl http://github.com/ludo/jquery-plugins/commit/d431200d0ebccefb9e1417ecbc2dae9159464135 d431200d0ebccefb9e1417ecbc2dae9159464135

2009-07-25T06:02:59-07:00

2009-07-25T04:06:18-07:00

Added 'clickableNodeNames' option 15337c244f7dd3072da11fa4868b107979e708f0 Ludo van den Boom ludo@kabisa.nl