compass-jquery-plugin 0.3.2.pre.2 → 0.3.2.0

data/lib/jquery/jquery_json_response.rb

@@ -0,0 +1,28 @@
+module ActionController
+  class Base
+  
+    # From http://paydrotalks.com/posts/45-standard-json-response-for-rails-and-jquery
+    
+    def render_json_response(type, hash)
+      unless [ :ok, :redirect, :error ].include?(type)
+        raise "Invalid json response type: #{type}"
+      end
+    
+      # To keep the structure consistent, we'll build the json 
+      # structure with the default properties.
+      #
+      # This will also help other developers understand what 
+      # is returned by the server by looking at this method.
+      default_json_structure = { 
+        :status => type, 
+        :html => nil, 
+         :message => nil, 
+        :to => nil }.merge(hash)
+     
+      render_options = {:json => default_json_structure}  
+      render_options[:status] = 400 if type == :error
+    
+      render(render_options)
+    end
+  end
+end

data/lib/jquery/secret_sauce.rb

@@ -1,9 +1,9 @@
-module SecretSauce#:nodoc:  
-end
-
-require 'jquery/secret_sauce/controller/ui_dialog_controls'
-require 'jquery/secret_sauce/controller/ui_grid_controls'
-require 'jquery/secret_sauce/helpers/ui_dialog_helper'
-require 'jquery/secret_sauce/helpers/ui_form_helper'
-require 'jquery/secret_sauce/helpers/ui_grid_helper'
+module SecretSauce#:nodoc:  
+end
+
+require 'jquery/secret_sauce/controller/ui_dialog_controls'
+require 'jquery/secret_sauce/controller/ui_grid_controls'
+require 'jquery/secret_sauce/helpers/ui_dialog_helper'
+require 'jquery/secret_sauce/helpers/ui_form_helper'
+require 'jquery/secret_sauce/helpers/ui_grid_helper'
 require 'jquery/secret_sauce/model/find_for_grid'

data/lib/jquery/secret_sauce/controller/ui_dialog_controls.rb

@@ -1,14 +1,14 @@
-module ActionController
-  class Base
-   
-    def render_close_dialog(dialog_id)
-      render :js => close_dialog
-    end    
-    
-    private
-    
-    def close_dialog(dialog_id)
-      "jQuery('##{dialog_id}').dialog('close');"
-    end    
-  end
+module ActionController
+  class Base
+   
+    def render_close_dialog(dialog_id)
+      render :js => close_dialog
+    end    
+    
+    private
+    
+    def close_dialog(dialog_id)
+      "jQuery('##{dialog_id}').dialog('close');"
+    end    
+  end
 end

data/lib/jquery/secret_sauce/controller/ui_grid_controls.rb

@@ -1,18 +1,18 @@
-module ActionController
-  class Base
-    
-    def render_refresh_grid
-      render :js => refresh_grid("#{params[:controller]}_table")
-    end
-    
-    def render_close_dialog_and_refresh_grid
-      render :js => close_dialog("#{params["controller"]}_#{params["action"]}_dialog")+refresh_grid("#{params[:controller]}_table")
-    end
-    
-    private
-  
-    def refresh_grid(grid_id)
-      "jQuery('##{grid_id}').trigger('reloadGrid');"
-    end    
-  end
-end
+module ActionController
+  class Base
+    
+    def render_refresh_grid
+      render :js => refresh_grid("#{params[:controller]}_table")
+    end
+    
+    def render_close_dialog_and_refresh_grid
+      render :js => close_dialog("#{params["controller"]}_#{params["action"]}_dialog")+refresh_grid("#{params[:controller]}_table")
+    end
+    
+    private
+  
+    def refresh_grid(grid_id)
+      "jQuery('##{grid_id}').trigger('reloadGrid');"
+    end    
+  end
+end

data/lib/jquery/secret_sauce/helpers/ui_dialog_helper.rb

@@ -1,6 +1,6 @@
-module SecretSauce
-  module Helpers
-    module UiDialogHelper
-    end    
-  end
+module SecretSauce
+  module Helpers
+    module UiDialogHelper
+    end    
+  end
 end

data/lib/jquery/secret_sauce/model/find_for_grid.rb

@@ -1,42 +1,42 @@
-module ActiveRecord
-  class Base      
-    # takes params from request and returns records serialized to json. handles the majority of the functionality
-    # for searching, sorting, and serializing records to be consumed by jqGrid.
-    def self.find_for_grid_2(params)
-      search_options = {:limit => params["rows"]}
-      search_options[:offset] = (params["page"].to_i * params["rows"].to_i) - params["rows"].to_i
-      search_options[:order] = "#{params['sidx']} #{params['sord']}" if params["sidx"] != ""
-      if params["_search"] == "true"
-        string_search_operations = {
-          "eq" => "=",
-          "ne" => "<>",
-          "bw" => "LIKE",
-          "bn" => "NOT LIKE",
-          "ew" => "LIKE",
-          "en" => "NOT LIKE",
-          "cn" => "LIKE",
-          "nc" => "NOT LIKE"
-        }
-        integer_search_operations = {
-          "eq" => "=",
-          "ne" => "<>",
-          "lt" => "<",
-          "le" => "<=",
-          "gt" => ">",
-          "ge" => ">="
-        }
-        if [:text, :string].include?(self.columns.select {|c| c.name == params["searchField"]}.first.type) && string_search_operations.keys.include?(params["searchOper"])
-          search_options[:conditions] = "#{params["searchField"]} "
-          search_options[:conditions] << "#{string_search_operations[params["searchOper"]]}"
-          search_options[:conditions] << "'#{"%" if ["ew", "en", "cn", "nc"].include?(params["searchOper"])}#{params["searchString"]}#{"%" if ["nc", "cn", "bn", "bw"].include?(params["searchOper"])}'"
-        elsif [:integer].include?(self.columns.select {|c| c.name == params["searchField"]}.first.type) && integer_search_operations.keys.include?(params["searchOper"])
-          search_options[:conditions] = "#{params["searchField"]} #{integer_search_operations[params["searchOper"]]} #{params["searchString"]}"
-        end
-      end
-      count  = self.count(:all, :conditions => search_options[:conditions]).to_f
-      # raise count.inspect
-      array = self.find(:all, search_options).collect {|r| r.attributes }
-      {:total => (count / params["rows"].to_f).ceil, :page => params["page"], :records => count, :rows => array }.to_json
-    end 
-  end
+module ActiveRecord
+  class Base      
+    # takes params from request and returns records serialized to json. handles the majority of the functionality
+    # for searching, sorting, and serializing records to be consumed by jqGrid.
+    def self.find_for_grid_2(params)
+      search_options = {:limit => params["rows"]}
+      search_options[:offset] = (params["page"].to_i * params["rows"].to_i) - params["rows"].to_i
+      search_options[:order] = "#{params['sidx']} #{params['sord']}" if params["sidx"] != ""
+      if params["_search"] == "true"
+        string_search_operations = {
+          "eq" => "=",
+          "ne" => "<>",
+          "bw" => "LIKE",
+          "bn" => "NOT LIKE",
+          "ew" => "LIKE",
+          "en" => "NOT LIKE",
+          "cn" => "LIKE",
+          "nc" => "NOT LIKE"
+        }
+        integer_search_operations = {
+          "eq" => "=",
+          "ne" => "<>",
+          "lt" => "<",
+          "le" => "<=",
+          "gt" => ">",
+          "ge" => ">="
+        }
+        if [:text, :string].include?(self.columns.select {|c| c.name == params["searchField"]}.first.type) && string_search_operations.keys.include?(params["searchOper"])
+          search_options[:conditions] = "#{params["searchField"]} "
+          search_options[:conditions] << "#{string_search_operations[params["searchOper"]]}"
+          search_options[:conditions] << "'#{"%" if ["ew", "en", "cn", "nc"].include?(params["searchOper"])}#{params["searchString"]}#{"%" if ["nc", "cn", "bn", "bw"].include?(params["searchOper"])}'"
+        elsif [:integer].include?(self.columns.select {|c| c.name == params["searchField"]}.first.type) && integer_search_operations.keys.include?(params["searchOper"])
+          search_options[:conditions] = "#{params["searchField"]} #{integer_search_operations[params["searchOper"]]} #{params["searchString"]}"
+        end
+      end
+      count  = self.count(:all, :conditions => search_options[:conditions]).to_f
+      # raise count.inspect
+      array = self.find(:all, search_options).collect {|r| r.attributes }
+      {:total => (count / params["rows"].to_f).ceil, :page => params["page"], :records => count, :rows => array }.to_json
+    end 
+  end
 end

data/templates/dynatree/jquery.dynatree.js

@@ -2,7 +2,7 @@
 	jquery.dynatree.js
 	Dynamic tree view control, with support for lazy loading of branches.
 
-	Copyright (c) 2008-2010, Martin Wendt (http://wwWendt.de)
+	Copyright (c) 2008-2011, Martin Wendt (http://wwWendt.de)
 	Dual licensed under the MIT or GPL Version 2 licenses.
 	http://code.google.com/p/dynatree/wiki/LicenseInfo
 
@@ -18,7 +18,7 @@
 *************************************************************************/
 
 // Note: We currently allow eval() to parse the 'data' attribtes, when initializing from HTML.
-/*jslint laxbreak: true, browser: true, evil: true */
+/*jslint laxbreak: true, browser: true, evil: true, indent: 0, white: false, onevar: false */
 
 /*************************************************************************
  *	Debug functions
@@ -179,10 +179,12 @@ DynaTreeNode.prototype = {
 	},
 
 	_getInnerHtml: function() {
-		var opts = this.tree.options;
-		var cache = this.tree.cache;
-		var level = this.getLevel();
-		var res = "";
+		var tree = this.tree,
+			opts = tree.options,
+			cache = tree.cache,
+			level = this.getLevel(),
+			data = this.data,
+			res = "";
 		// connector (expanded, expandable or simple)
 		if( level < opts.minExpandLevel ) {
 			if(level > 1){
@@ -195,26 +197,33 @@ DynaTreeNode.prototype = {
 			res += cache.tagConnector;
 		}
 		// Checkbox mode
-		if( opts.checkbox && this.data.hideCheckbox !== true && !this.data.isStatusNode ) {
+		if( opts.checkbox && data.hideCheckbox !== true && !data.isStatusNode ) {
 			res += cache.tagCheckbox;
 		}
 		// folder or doctype icon
-		if ( this.data.icon ) {
-			res += "<img src='" + opts.imagePath + this.data.icon + "' alt='' />";
-		} else if ( this.data.icon === false ) {
+		if ( data.icon ) {
+			res += "<img src='" + opts.imagePath + data.icon + "' alt='' />";
+		} else if ( data.icon === false ) {
 			// icon == false means 'no icon'
 			noop(); // keep JSLint happy
 		} else {
 			// icon == null means 'default icon'
 			res += cache.tagNodeIcon;
 		}
-		// node name
-		var tooltip = this.data.tooltip ? " title='" + this.data.tooltip + "'" : "";
-		if( opts.noLink || this.data.noLink ) {
-			res += "<span style='display: inline-block;' class='" + opts.classNames.title + "'" + tooltip + ">" + this.data.title + "</span>";
-		}else{
-			res += "<a href='#' class='" + opts.classNames.title + "'" + tooltip + ">" + this.data.title + "</a>";
+		// node title
+		var nodeTitle = "";
+		if ( opts.onCustomRender ){
+			nodeTitle = opts.onCustomRender.call(tree, this) || "";
+		}
+		if(!nodeTitle){
+			var tooltip = data.tooltip ? " title='" + data.tooltip + "'" : "";
+			if( opts.noLink || data.noLink ) {
+				nodeTitle = "<span style='display: inline-block;' class='" + opts.classNames.title + "'" + tooltip + ">" + data.title + "</span>";
+			}else{
+				nodeTitle = "<a href='#' class='" + opts.classNames.title + "'" + tooltip + ">" + data.title + "</a>";
+			}
 		}
+		res += nodeTitle;
 		return res;
 	},
 
@@ -224,7 +233,7 @@ DynaTreeNode.prototype = {
 		 * Make sure, that <li> order matches childList order.
 		 */
 		var cl = this.childList;
-		if( !cl ){
+		if( !cl || !this.ul ){
 			return;
 		}
 		var childLI = this.ul.firstChild;
@@ -241,9 +250,9 @@ DynaTreeNode.prototype = {
 	},
 
 
-	render: function(useEffects) {
+	render: function(useEffects, includeInvisible) {
 		/**
-		 * create <li><span>..</span> .. </li> tags for this node.
+		 * Create <li><span>..</span> .. </li> tags for this node.
 		 *
 		 * <li id='key'> // This div contains the node's span and list of child div's.
 		 *   <span class='title'>S S S A</span> // Span contains graphic spans and title <a> tag
@@ -255,11 +264,14 @@ DynaTreeNode.prototype = {
 		 */
 //		this.tree.logDebug("%s.render(%s)", this, useEffects);
 		// ---
-		var opts = this.tree.options;
-		var cn = opts.classNames;
-		var isLastSib = this.isLastSibling();
-
-		if( !this.parent && !this.ul ) {
+		var tree = this.tree,
+			parent = this.parent,
+			data = this.data,
+			opts = tree.options,
+			cn = opts.classNames,
+			isLastSib = this.isLastSibling();
+
+		if( !parent && !this.ul ) {
 			// Root node has only a <ul>
 			this.li = this.span = null;
 			this.ul = document.createElement("ul");
@@ -268,37 +280,36 @@ DynaTreeNode.prototype = {
 			}else{
 				this.ul.className = cn.container;
 			}
-		} else if( this.parent ) {
+		} else if( parent ) {
 			// Create <li><span /> </li>
 			if( ! this.li ) {
 				this.li = document.createElement("li");
 				this.li.dtnode = this;
-				if( this.data.key && opts.generateIds ){
-					this.li.id = opts.idPrefix + this.data.key;
+				if( data.key && opts.generateIds ){
+					this.li.id = opts.idPrefix + data.key;
 				}
 				this.span = document.createElement("span");
 				this.span.className = cn.title;
 				this.li.appendChild(this.span);
 
-				if( !this.parent.ul ) {
+				if( !parent.ul ) {
 					// This is the parent's first child: create UL tag
 					// (Hidden, because it will be
-					this.parent.ul = document.createElement("ul");
-					this.parent.ul.style.display = "none";
-					this.parent.li.appendChild(this.parent.ul);
+					parent.ul = document.createElement("ul");
+					parent.ul.style.display = "none";
+					parent.li.appendChild(parent.ul);
 //					if( opts.minExpandLevel > this.getLevel() ){
-//						this.parent.ul.className = cn.noConnector;
+//						parent.ul.className = cn.noConnector;
 //					}
 				}
-				this.parent.ul.appendChild(this.li);
+				parent.ul.appendChild(this.li);
 			}
 			// set node connector images, links and text
 			this.span.innerHTML = this._getInnerHtml();
-
 			// Set classes for current status
 			var cnList = [];
 			cnList.push(cn.node);
-			if( this.data.isFolder ){
+			if( data.isFolder ){
 				cnList.push(cn.folder);
 			}
 			if( this.bExpanded ){
@@ -307,7 +318,7 @@ DynaTreeNode.prototype = {
 			if( this.hasChildren() !== false ){
 				cnList.push(cn.hasChildren);
 			}
-			if( this.data.isLazy && this.childList === null ){
+			if( data.isLazy && this.childList === null ){
 				cnList.push(cn.lazy);
 			}
 			if( isLastSib ){
@@ -319,22 +330,22 @@ DynaTreeNode.prototype = {
 			if( this.hasSubSel ){
 				cnList.push(cn.partsel);
 			}
-			if( this.tree.activeNode === this ){
+			if( tree.activeNode === this ){
 				cnList.push(cn.active);
 			}
-			if( this.data.addClass ){
-				cnList.push(this.data.addClass);
+			if( data.addClass ){
+				cnList.push(data.addClass);
 			}
 			// IE6 doesn't correctly evaluate multiple class names,
 			// so we create combined class names that can be used in the CSS
 			cnList.push(cn.combinedExpanderPrefix
 					+ (this.bExpanded ? "e" : "c")
-					+ (this.data.isLazy && this.childList === null ? "d" : "")
+					+ (data.isLazy && this.childList === null ? "d" : "")
 					+ (isLastSib ? "l" : "")
 					);
 			cnList.push(cn.combinedIconPrefix
 					+ (this.bExpanded ? "e" : "c")
-					+ (this.data.isFolder ? "f" : "")
+					+ (data.isFolder ? "f" : "")
 					);
 			this.span.className = cnList.join(" ");
 
@@ -342,13 +353,18 @@ DynaTreeNode.prototype = {
 			this.li.className = isLastSib ? cn.lastsib : "";
 
 			// Hide children, if node is collapsed
-//			this.ul.style.display = ( this.bExpanded || !this.parent ) ? "" : "none";
+//			this.ul.style.display = ( this.bExpanded || !parent ) ? "" : "none";
+			// Allow tweaking, binding, ...
+			if(opts.onRender){
+				opts.onRender.call(tree, this, this.span);
+			}
 		}
-
-		if( this.bExpanded && this.childList ) {
+		// Visit child nodes
+		if( (this.bExpanded || includeInvisible === true) && this.childList ) {
 			for(var i=0, l=this.childList.length; i<l; i++) {
-				this.childList[i].render();
+				this.childList[i].render(false, includeInvisible);
 			}
+			// Make sure the tag order matches the child array
 			this._fixOrder();
 		}
 		// Hide children, if node is collapsed
@@ -360,7 +376,7 @@ DynaTreeNode.prototype = {
 				var duration = opts.fx.duration || 200;
 				$(this.ul).animate(opts.fx, duration);
 			} else {
-				this.ul.style.display = ( this.bExpanded || !this.parent ) ? "" : "none";
+				this.ul.style.display = ( this.bExpanded || !parent ) ? "" : "none";
 			}
 		}
 	},
@@ -459,6 +475,19 @@ DynaTreeNode.prototype = {
 		return false;
 	},
 
+	countChildren: function() {
+		var cl = this.childList;
+		if( !cl ){
+			return 0;
+		}
+		var n = cl.length;
+		for(var i=0, l=n; i<l; i++){
+			var child = cl[i];
+			n += child.countChildren();
+		}
+		return n;
+	},
+
 	/**Sort child list by title.
 	 * cmd: optional compare function.
 	 * deep: optional: pass true to sort all descendant nodes.
@@ -568,7 +597,6 @@ DynaTreeNode.prototype = {
 		}
 		return l;
 	},
-
 	getLevel: function() {
 		/**
 		 * Return node depth. 0: System root node, 1: visible top-level node.
@@ -683,7 +711,6 @@ DynaTreeNode.prototype = {
 		if ( fireEvents && opts.onQueryActivate && opts.onQueryActivate.call(this.tree, flag, this) === false ){
 			return; // Callback returned false
 		}
-
 		if( flag ) {
 			// Activate
 			if( this.tree.activeNode ) {
@@ -1961,9 +1988,9 @@ DynaTree.prototype = {
 		if( opts.rootVisible !== undefined ){
 			_log("warn", "Option 'rootVisible' is no longer supported.");
 		}
-		if( opts.title  !== undefined ){
-			_log("warn", "Option 'title' is no longer supported.");
-		}
+//		if( opts.title  !== undefined ){
+//			_log("warn", "Option 'title' is no longer supported.");
+//		}
 		if( opts.minExpandLevel < 1 ) {
 			_log("warn", "Option 'minExpandLevel' must be >= 1.");
 			opts.minExpandLevel = 1;
@@ -2222,11 +2249,13 @@ DynaTree.prototype = {
 	},
 
 	redraw: function() {
-		this.logDebug("dynatree.redraw()...");
-		this.tnRoot.render(false);
-		this.logDebug("dynatree.redraw() done.");
+//		this.logDebug("dynatree.redraw()...");
+		this.tnRoot.render(false, false);
+//		this.logDebug("dynatree.redraw() done.");
+	},
+	renderInvisibleNodes: function() {
+		this.tnRoot.render(false, true);
 	},
-
 	reload: function(callback) {
 		this._load(callback);
 	},
@@ -2341,6 +2370,10 @@ DynaTree.prototype = {
 		return !bEnable; // return previous value
 	},
 
+	count: function() {
+		return this.tnRoot.countChildren();
+	},
+
 	visit: function(fn, includeRoot) {
 		return this.tnRoot.visit(fn, includeRoot);
 	},
@@ -2424,7 +2457,7 @@ TODO: better?
 				.hide()
 				.prependTo($(this.divTree).parent());
 //				.prependTo("body");
-			logMsg("Creating marker: %o", this.$dndMarker);
+//			logMsg("Creating marker: %o", this.$dndMarker);
 		}
 /*
 		if(hitMode === "start"){
@@ -2520,9 +2553,9 @@ TODO: better?
 		 *     _onDragEvent("leave", targetNode, sourceNode, event, ui, draggable);
 		 *     _onDragEvent("stop", sourceNode, null, event, ui, draggable);
 		 */
-		if(eventName !== "over"){
-			this.logDebug("tree._onDragEvent(%s, %o, %o) - %o", eventName, node, otherNode, this);
-		}
+//		if(eventName !== "over"){
+//			this.logDebug("tree._onDragEvent(%s, %o, %o) - %o", eventName, node, otherNode, this);
+//		}
 		var opts = this.options;
 		var dnd = this.options.dnd;
 		var res = null;
@@ -2536,7 +2569,7 @@ TODO: better?
 				.append($(event.target).closest('a').clone());
 			// Attach node reference to helper object
 			helper.data("dtSourceNode", node);
-			this.logDebug("helper.sourceNode=%o", helper.data("dtSourceNode"));
+//			this.logDebug("helper.sourceNode=%o", helper.data("dtSourceNode"));
 			res = helper;
 			break;
 		case "start":
@@ -2563,7 +2596,7 @@ TODO: better?
 				after: (res !== false) && ((res === true) || (res === "after") || $.inArray("after", res) >= 0)
 			};
 			ui.helper.data("enterResponse", res);
-			this.logDebug("helper.enterResponse: %o", res);
+//			this.logDebug("helper.enterResponse: %o", res);
 			break;
 		case "over":
 			var enterResponse = ui.helper.data("enterResponse");
@@ -2606,40 +2639,23 @@ TODO: better?
 				// TODO: these are no-ops when moving nodes, but not in copy mode
 				if( dnd.preventVoidMoves ){
 					if(node === otherNode){
-						this.logDebug("    drop over source node prevented");
+//						this.logDebug("    drop over source node prevented");
 						hitMode = null;
 					}else if(hitMode === "before" && otherNode && node === otherNode.getNextSibling()){
-						this.logDebug("    drop after source node prevented");
+//						this.logDebug("    drop after source node prevented");
 						hitMode = null;
 					}else if(hitMode === "after" && otherNode && node === otherNode.getPrevSibling()){
-						this.logDebug("    drop before source node prevented");
+//						this.logDebug("    drop before source node prevented");
 						hitMode = null;
 					}else if(hitMode === "over" && otherNode
 							&& otherNode.parent === node && otherNode.isLastSibling() ){
-						this.logDebug("    drop last child over own parent prevented");
+//						this.logDebug("    drop last child over own parent prevented");
 						hitMode = null;
 					}
 				}
-				this.logDebug("hitMode: %s - %s - %s", hitMode, (node.parent === otherNode), node.isLastSibling());
+//				this.logDebug("hitMode: %s - %s - %s", hitMode, (node.parent === otherNode), node.isLastSibling());
 				ui.helper.data("hitMode", hitMode);
-/*
-				logMsg("    clientPos: %s/%s", event.clientX, event.clientY);
-				logMsg("    clientPos: %s/%s", event.pageX, event.pageY);
-				logMsg("    nodeOfs: %s/%s", nodeOfs.left, nodeOfs.top);
-				logMsg("    relPos: %s/%s", relPos.x, relPos.y);
-				logMsg("    relPos2: %s/%s: %s", relPos2.x, relPos2.y, hitMode);
-				logMsg("    e:%o", event);
-*/
 			}
-/*			var checkPos = function(node, pos) {
-				var dyClick = this.offset.click.top, dxClick = this.offset.click.left;
-				var helperTop = this.positionAbs.top, helperLeft = this.positionAbs.left;
-				var itemHeight = o.height, itemWidth = o.width;
-				var itemTop = o.top, itemLeft = o.left;
-
-				return $.ui.isOver(helperTop + dyClick, helperLeft + dxClick, itemTop, itemLeft, itemHeight, itemWidth);
-			};
-			var relPos = event.()*/
 			// Auto-expand node (only when 'over' the node, not 'before', or 'after')
 			if(hitMode === "over"
 				&& dnd.autoExpandMS && node.hasChildren() !== false && !node.bExpanded) {
@@ -2651,10 +2667,7 @@ TODO: better?
 			this._setDndStatus(otherNode, node, ui.helper, hitMode, res!==false);
 			break;
 		case "drop":
-//          var enterResponse = ui.helper.data("enterResponse");
 			hitMode = ui.helper.data("hitMode");
-//			if(dnd.onDrop && enterResponse !== false)
-//				dnd.onDrop(node, otherNode, hitMode)
 			if(hitMode && dnd.onDrop){
 				dnd.onDrop(node, otherNode, hitMode, ui, draggable);
 			}
@@ -2664,7 +2677,6 @@ TODO: better?
 			node.scheduleAction("cancel");
 			ui.helper.data("enterResponse", null);
 			ui.helper.data("hitMode", null);
-//            nodeTag.removeClass("dynatree-drop-hover dynatree-drop-accept dynatree-drop-reject");
 			this._setDndStatus(otherNode, node, ui.helper, "out", undefined);
 			if(dnd.onDragLeave){
 				dnd.onDragLeave(node, otherNode);
@@ -2890,6 +2902,8 @@ $.ui.dynatree.prototype.options = {
 	onSelect: null, // Callback(flag, dtnode) when a node is (de)selected.
 	onExpand: null, // Callback(dtnode) when a node is expanded/collapsed.
 	onLazyRead: null, // Callback(dtnode) when a lazy node is expanded for the first time.
+	onCustomRender: null, // Callback(dtnode) before a node is rendered. Return a HTML string to override.
+	onRender: null, // Callback(dtnode, nodeSpan) after a node was rendered.
 
 	// Drag'n'drop support
 	dnd: {
@@ -3044,22 +3058,12 @@ var _registerDnd = function() {
 		start: function(event, ui) {
 			var draggable = $(this).data("draggable");
 			var sourceNode = ui.helper.data("dtSourceNode") || null;
-			logMsg("draggable-connectToDynatree.start, %s", sourceNode);
-			logMsg("    this: %o", this);
-			logMsg("    event: %o", event);
-			logMsg("    draggable: %o", draggable);
-			logMsg("    ui: %o", ui);
+//			logMsg("draggable-connectToDynatree.start, %s", sourceNode);
+//			logMsg("    this: %o", this);
+//			logMsg("    event: %o", event);
+//			logMsg("    draggable: %o", draggable);
+//			logMsg("    ui: %o", ui);
 			if(sourceNode) {
-				// Adjust helper offset for tree nodes
-/*
-				var sourcePosition = $(sourceNode.span).position();
-				var cssPosition = $(ui.helper).position();
-				logMsg("    draggable.offset.click: %s/%s", draggable.offset.click.left, draggable.offset.click.top);
-				logMsg("    sourceNode.position: %s/%s", sourcePosition.left, sourcePosition.top);
-				logMsg("    helper.position: %s/%s", cssPosition.left, cssPosition.top);
-				logMsg("    event.target.offset: %s/%s,  %sx%s", event.target.offsetLeft, event.target.offsetTop, event.target.offsetWidth, event.target.offsetHeight);
-				logMsg("    draggable.positionAbs: %s/%s", draggable.positionAbs.left, draggable.positionAbs.top);
-*/
 				// Adjust helper offset, so cursor is slightly outside top/left corner
 //				draggable.offset.click.top -= event.target.offsetTop;
 //				draggable.offset.click.left -= event.target.offsetLeft;
@@ -3083,7 +3087,7 @@ var _registerDnd = function() {
 				// jumped over the drag helper, in which case we ignore it:
 				var isHelper = $(event.target).closest("div.dynatree-drag-helper,#dynatree-drop-marker").length > 0;
 				if(isHelper){
-					logMsg("Drag event over helper: ignored.");
+//					logMsg("Drag event over helper: ignored.");
 					return;
 				}
 			}
@@ -3110,16 +3114,13 @@ var _registerDnd = function() {
 		stop: function(event, ui) {
 			var draggable = $(this).data("draggable");
 			var sourceNode = ui.helper.data("dtSourceNode") || null;
-//	        var targetNode = getDtNodeFromElement(event.target);
 			var targetNode = ui.helper.data("dtTargetNode") || null;
-			logMsg("draggable-connectToDynatree.stop: targetNode(from event): %s, dtTargetNode: %s", targetNode, ui.helper.data("dtTargetNode"));
-	//        var targetTree = targetNode ? targetNode.tree : null;
-	//        if(dtnode && dtnode.tree.
-			logMsg("draggable-connectToDynatree.stop, %s", sourceNode);
+//			logMsg("draggable-connectToDynatree.stop: targetNode(from event): %s, dtTargetNode: %s", targetNode, ui.helper.data("dtTargetNode"));
+//			logMsg("draggable-connectToDynatree.stop, %s", sourceNode);
 			var mouseDownEvent = draggable._mouseDownEvent;
 			var eventType = event.type;
-			logMsg("    type: %o, downEvent: %o, upEvent: %o", eventType, mouseDownEvent, event);
-			logMsg("    targetNode: %o", targetNode);
+//			logMsg("    type: %o, downEvent: %o, upEvent: %o", eventType, mouseDownEvent, event);
+//			logMsg("    targetNode: %o", targetNode);
 			var dropped = (eventType == "mouseup" && event.which == 1);
 			if(!dropped){
 				logMsg("Drag was cancelled");