kosmas58-compass-jquery-plugin 0.1.8.1 → 0.1.8.2

data/README.textile

@@ -8,7 +8,7 @@ A Sass-based Meta-Framework for Compass that allows you to mix and match any of
 
 * jRails with jQuery and jQuery.UI including themes
 * jqGrid V3.5
-* dynatree V0.5.0
+* dynatree V0.5.1
 
 This library requires <b>"Compass":http://wiki.github.com/chriseppstein/compass</b>.
 

data/lib/jquery/version.rb

@@ -1,10 +1,11 @@
 module CompassJqueryPlugin#:nodoc:
 
   class VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 1
+    
+    PATCH = 2 # Set to nil for official release
     TINY  = 8
-    PATCH = 1 # Set to nil for official release
+    MINOR = 1
+    MAJOR = 0
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
     STABLE_STRING = [MAJOR, MINOR, TINY].join('.')

data/templates/dynatree/jquery.dynatree.js

@@ -10,8 +10,8 @@
 
 	Let me know, if you find bugs or improvements (martin at domain wwWendt.de).
 
-	$Version: 0.5.0$
-	$Revision: 261, 2009-07-09 17:33:58$
+	$Version: 0.5.1$
+	$Revision: 279, 2009-08-16 21:08:44$
 
  	@depends: jquery.js
  	@depends: ui.core.js
@@ -109,7 +109,7 @@ DynaTreeNode.prototype = {
 		this.div = null; // not yet created
 		this.span = null; // not yet created
 		this.childList = null; // no subnodes yet
-		this.isRead = false; // Lazy content not yet read
+//		this.isRead = false; // Lazy content not yet read
 		this.isLoading = false; // Lazy content is being loaded
 		this.hasSubSel = false;
 	},
@@ -184,6 +184,27 @@ DynaTreeNode.prototype = {
 		return res;
 	},
 
+	_fixOrder: function() {
+		/**
+		 * Make sure, that <div> order matches childList order.
+		 */
+		var cl = this.childList; 
+		if( !cl )
+			return;
+		var childDiv = this.div.firstChild.nextSibling;
+		for(var i=0; i<cl.length-1; i++) {
+			var childNode1 = cl[i]; 
+			var childNode2 = childDiv.firstChild.dtnode;
+			if( childNode1 !== childNode2 ) {
+//
+				this.tree.logDebug("_fixOrder: mismatch at index " + i + ": " + childNode1 + " != " + childNode2);
+				this.div.insertBefore(childNode1.div, childNode2.div);
+			} else {
+				childDiv = childDiv.nextSibling;
+			}
+		}
+	},
+	
 	render: function(bDeep, bHidden) {
 		/**
 		 * Create HTML markup for this node.
@@ -195,17 +216,21 @@ DynaTreeNode.prototype = {
 		 * </div>
 		 */
 //		this.tree.logDebug("%o.render()", this);
+		var opts = this.tree.options;
+		var cn = opts.classNames;
+		var isLastSib = this.isLastSibling();
 		// --- 
 		if( ! this.div ) {
 			this.span = document.createElement("span");
 			this.span.dtnode = this;
 			if( this.data.key )
 				this.span.id = this.tree.options.idPrefix + this.data.key;
-
 			this.div  = document.createElement("div");
 			this.div.appendChild(this.span);
-			if ( this.parent )
+			
+			if ( this.parent ) {
 				this.parent.div.appendChild(this.div);
+			}
 
 			if( this.parent==null && !this.tree.options.rootVisible )
 				this.span.style.display = "none";
@@ -217,14 +242,13 @@ DynaTreeNode.prototype = {
 		this.div.style.display = ( this.parent==null || this.parent.bExpanded ? "" : "none");
 
 		// Set classes for current status
-		var opts = this.tree.options;
-		var cn = opts.classNames;
-		var isLastSib = this.isLastSibling();
 		var cnList = [];
 		cnList.push( ( this.data.isFolder ) ? cn.folder : cn.document );
 		if( this.bExpanded )
 			cnList.push(cn.expanded);
-		if( this.data.isLazy && !this.isRead )
+		if( this.childList != null )
+			cnList.push(cn.hasChildren);
+		if( this.data.isLazy && this.childList==null )
 			cnList.push(cn.lazy);
 		if( isLastSib )
 			cnList.push(cn.lastsib);
@@ -240,7 +264,7 @@ DynaTreeNode.prototype = {
 		// 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.isRead ? "d" : "")
+				+ (this.data.isLazy && this.childList==null ? "d" : "")
 				+ (isLastSib ? "l" : "")
 				);
 		cnList.push(cn.combinedIconPrefix
@@ -253,6 +277,7 @@ DynaTreeNode.prototype = {
 			for(var i=0; i<this.childList.length; i++) {
 				this.childList[i].render(bDeep, bHidden)
 			}
+			this._fixOrder();
 		}
 	},
 
@@ -309,7 +334,7 @@ DynaTreeNode.prototype = {
 		switch( lts ) {
 			case DTNodeStatus_Ok:
 				this._setStatusNode(null);
-				this.isRead = true;
+//				this.isRead = true;
 				this.isLoading = false;
 				this.render(false, false);
 				if( this.tree.options.autoFocus ) {
@@ -377,7 +402,6 @@ DynaTreeNode.prototype = {
 	    // Event coordinates, relative to outer node span:
 	    var eventX = event.pageX - target.offsetLeft;
 	    var eventY = event.pageY - target.offsetTop;
-//	    alert ("click at " + eventX + ", " + eventY);
 	    
 	    for(var i=0; i<target.childNodes.length; i++) {
 	        var cn = target.childNodes[i];
@@ -648,6 +672,8 @@ DynaTreeNode.prototype = {
 	select: function(sel) {
 		// Select - but not focus - this node.
 //		this.tree.logDebug("dtnode.select(%o) - %o", sel, this);
+		if( this.data.unselectable )
+			return this.bSelected;
 		return this._select(sel!=false, true, true);
 	},
 
@@ -660,6 +686,24 @@ DynaTreeNode.prototype = {
 		return this.bSelected;
 	},
 	
+	_loadContent: function() {
+		try {
+			var opts = this.tree.options;
+			this.tree.logDebug("_loadContent: start - %o", this);
+			this.setLazyNodeStatus(DTNodeStatus_Loading);
+			if( true == opts.onLazyRead.call(this.span, this) ) {
+				// If function returns 'true', we assume that the loading is done:
+				this.setLazyNodeStatus(DTNodeStatus_Ok);
+				// Otherwise (i.e. if the loading was started as an asynchronous process)
+				// the onLazyRead(dtnode) handler is expected to call dtnode.setLazyNodeStatus(DTNodeStatus_Ok/_Error) when done.
+				this.tree.logDebug("_loadContent: succeeded - %o", this);
+			}
+		} catch(e) {
+			alert(e);
+			this.setLazyNodeStatus(DTNodeStatus_Error);
+		}
+	},
+	
 	_expand: function(bExpand) {
 //		this.tree.logDebug("dtnode._expand(%o) - %o", bExpand, this);
 		if( this.bExpanded == bExpand ) {
@@ -692,41 +736,31 @@ DynaTreeNode.prototype = {
 				parents[i].collapseSiblings();
 		}
 
-		// If currently active node is now hidden, deactivate it
+		// If the currently active node is now hidden, deactivate it
 		if( opts.activeVisible && this.tree.activeNode && ! this.tree.activeNode.isVisible() ) {
 			this.tree.activeNode.deactivate();
 		}
 		// Expanding a lazy node: set 'loading...' and call callback
-		if( bExpand && this.data.isLazy && !this.isRead && !this.isLoading ) {
-			try {
-				this.tree.logDebug("_expand: start lazy - %o", this);
-				this.setLazyNodeStatus(DTNodeStatus_Loading);
-				if( true == opts.onLazyRead.call(this.span, this) ) {
-					// If function returns 'true', we assume that the loading is done:
-					this.setLazyNodeStatus(DTNodeStatus_Ok);
-					// Otherwise (i.e. if the loading was started as an asynchronous process)
-					// the onLazyRead(dtnode) handler is expected to call dtnode.setLazyNodeStatus(DTNodeStatus_Ok/_Error) when done.
-					this.tree.logDebug("_expand: lazy succeeded - %o", this);
-				}
-			} catch(e) {
-				this.setLazyNodeStatus(DTNodeStatus_Error);
-			}
+		if( bExpand && this.data.isLazy && this.childList==null && !this.isLoading ) {
+			this._loadContent();
 			return;
 		}
 //		this.tree.logDebug("_expand: start div toggle - %o", this);
 
 		var fxDuration = opts.fx ? (opts.fx.duration || 200) : 0;
-		for(var i=0; i<this.childList.length; i++ ) {
-			var $child = $(this.childList[i].div);
-			if( fxDuration ) {
-				// This is a toggle, so only do it, if not already rendered (in)visible (issue 98)
-				if( bExpand != $child.is(':visible') )
-					$child.animate(opts.fx, fxDuration);
-			} else {
-				if( bExpand )
-					$child.show();
-				else
-					$child.hide(); // TODO: this seems to be slow, when called the first time for an element
+		if( this.childList ) {
+			for(var i=0; i<this.childList.length; i++ ) {
+				var $child = $(this.childList[i].div);
+				if( fxDuration ) {
+					// This is a toggle, so only do it, if not already rendered (in)visible (issue 98)
+					if( bExpand != $child.is(':visible') )
+						$child.animate(opts.fx, fxDuration);
+				} else {
+					if( bExpand )
+						$child.show();
+					else
+						$child.hide(); // TODO: this seems to be slow, when called the first time for an element
+				}
 			}
 		}
 		
@@ -776,20 +810,18 @@ DynaTreeNode.prototype = {
 	onClick: function(event) {
 //		this.tree.logDebug("dtnode.onClick(" + event.type + "): dtnode:" + this + ", button:" + event.button + ", which: " + event.which);
 		var targetType = this.getEventTargetType(event);
-//		if( $(event.target).hasClass(this.tree.options.classNames.expander) ) {
 		if( targetType == "expander" ) {
 			// Clicking the expander icon always expands/collapses
 			this.toggleExpand();
-//		} else if( $(event.target).hasClass(this.tree.options.classNames.checkbox) ) {
+			this.focus(); // issue 95
 		} else if( targetType == "checkbox" ) {
 			// Clicking the checkbox always (de)selects
 			this.toggleSelect();
+			this.focus(); // issue 95
 		} else {
 			this._userActivate();
 			// Chrome and Safari don't focus the a-tag on click
-//			this.tree.logDebug("a tag: ", this.span.getElementsByTagName("a")[0]);
 			this.span.getElementsByTagName("a")[0].focus();
-//			alert("hasFocus=" + this.span.getElementsByTagName("a")[0].focused);
 		}
 		// Make sure that clicks stop, otherwise <a href='#'> jumps to the top
 		return false;
@@ -959,9 +991,9 @@ DynaTreeNode.prototype = {
 		}
 	},
 
-	removeChildren: function(recursive) {
+	removeChildren: function(isRecursiveCall) {
         // Remove all child nodes (more efficiently than recursive remove())
-//		this.tree.logDebug ("%o.removeChildren(%o)", this, recursive);
+//		this.tree.logDebug ("%o.removeChildren(%o)", this, isRecursiveCall);
 		var tree = this.tree;
         var ac = this.childList;
         if( ac ) {
@@ -981,16 +1013,31 @@ DynaTreeNode.prototype = {
                 delete tn;
         	}
         	this.childList = null;
-			if( ! recursive ) {
-				this._expand(false);
-				this.isRead = false;
-				this.isLoading = false;
-				this.render(false, false);
-			}
         }
+		if( ! isRecursiveCall ) {
+//			this._expand(false);
+//			this.isRead = false;
+			this.isLoading = false;
+			this.render(false, false);
+		}
+	},
+
+	reload: function(force) {
+		// Discard lazy content (and reload, if node is expanded). 
+		if( ! this.data.isLazy )
+			throw "node.reload() requires lazy nodes.";
+		if( this.bExpanded ) {
+			this.expand(false);
+			this.removeChildren();
+			this.expand(true);
+		} else {
+			this.removeChildren();
+			if( force )
+				this._loadContent();
+		}
 	},
 
-	_addChildNode: function(dtnode, insertBefore) {
+	_addChildNode: function(dtnode, beforeNode) {
 		/** 
 		 * Internal function to add one single DynatreeNode as a child.
 		 * 
@@ -1001,19 +1048,28 @@ DynaTreeNode.prototype = {
 		
 //		tree.logDebug("%o._addChildNode(%o)", this, dtnode);
 		
-		// --- Add dtnode as a child
-		// TODO: implement insertBefore
+		// --- Update and fix dtnode attributes if necessary 
+		dtnode.parent = this;
+//		if( beforeNode && (beforeNode.parent !== this || beforeNode === dtnode ) )
+//			throw "<beforeNode> must be another child of <this>";
 
+		// --- Add dtnode as a child
 		if ( this.childList==null ) {
 			this.childList = [];
-		} else {
+		} else if( ! beforeNode ) {
 			// Fix 'lastsib'
 			$(this.childList[this.childList.length-1].span).removeClass(opts.classNames.lastsib);
 		}
-		this.childList.push (dtnode);
-
-		// --- Update and fix dtnode attributes if necessary 
-		dtnode.parent = this;
+		if( beforeNode ) {
+			var iBefore = $.inArray(beforeNode, this.childList);
+			if( iBefore < 0 )
+				throw "<beforeNode> must be a child of <this>";
+			this.childList.splice(iBefore, 0, dtnode);
+//			alert(this.childList);
+		} else {
+			// Append node
+			this.childList.push(dtnode);
+		}
 
 		// --- Handle persistence 
 		// Initial status is read from cookies, if persistence is active and 
@@ -1046,6 +1102,14 @@ DynaTreeNode.prototype = {
 			if( dtnode.bExpanded && opts.persist )
 				pers.addExpand(dtnode.data.key);
 			dtnode.bSelected = ( dtnode.data.select == true ); // Deselected by default
+/*			
+			Doesn't work, cause pers.selectedKeyList may be null
+			if( dtnode.bSelected && opts.selectMode==1 
+				&& pers.selectedKeyList && pers.selectedKeyList.length>0 ) {
+				tree.logWarning("Ignored multi-selection in single-mode for %o", dtnode);
+				dtnode.bSelected = false; // Fixing bad input data (multi selection for mode:1)
+			}
+*/
 			if( dtnode.bSelected && opts.persist )
 				pers.addSelect(dtnode.data.key);
 		}
@@ -1078,7 +1142,7 @@ DynaTreeNode.prototype = {
 		return dtnode;
 	},
 
-	addChild: function(obj, insertBefore) {
+	addChild: function(obj, beforeNode) {
 		/**
 		 * Add a node object as child.
 		 * 
@@ -1086,7 +1150,7 @@ DynaTreeNode.prototype = {
 		 * (Except for the root node creation in the tree constructor)
 		 * 
 		 * @param obj A JS object (may be recursive) or an array of those.
-		 * @param {DynaTreeNode} insertBefore (optional) sibling node.
+		 * @param {DynaTreeNode} beforeNode (optional) sibling node.
 		 *     
 		 * Data format: array of node objects, with optional 'children' attributes.
 		 * [
@@ -1101,11 +1165,11 @@ DynaTreeNode.prototype = {
 		 * A simple object is also accepted instead of an array.
 		 * 
 		 */
-//		this.tree.logDebug("%o.addChild(%o, %o)", this, obj, insertBefore);
+//		this.tree.logDebug("%o.addChild(%o, %o)", this, obj, beforeNode);
 		if( !obj || obj.length==0 ) // Passed null or undefined or empty array
 			return;
 		if( obj instanceof DynaTreeNode )
-			return this._addChildNode(obj, insertBefore);
+			return this._addChildNode(obj, beforeNode);
 		if( !obj.length ) // Passed a single data object
 			obj = [ obj ];
 
@@ -1114,7 +1178,7 @@ DynaTreeNode.prototype = {
 		var tnFirst = null;
 		for (var i=0; i<obj.length; i++) {
 			var data = obj[i];
-			var dtnode = this._addChildNode(new DynaTreeNode(this, this.tree, data), insertBefore);
+			var dtnode = this._addChildNode(new DynaTreeNode(this, this.tree, data), beforeNode);
 			if( !tnFirst ) tnFirst = dtnode;
 			// Add child nodes recursively
 			if( data.children )
@@ -1125,13 +1189,12 @@ DynaTreeNode.prototype = {
 	},
 
 	append: function(obj) {
-		/**
-		 * @deprecated 
-		 */
+		this.tree.logWarning("node.append() is deprecated (use node.addChild() instead).");
 		return this.addChild(obj, null);
 	},
 
 	appendAjax: function(ajaxOptions) {
+		this.removeChildren();
 		this.setLazyNodeStatus(DTNodeStatus_Loading);
 		// Ajax option inheritance: $.ajaxSetup < $.ui.dynatree.defaults.ajaxDefaults < tree.options.ajaxDefaults < ajaxOptions
 		var self = this;
@@ -1142,7 +1205,8 @@ DynaTreeNode.prototype = {
      		    // <this> is the request options
 				var prevPhase = self.tree.phase;
 				self.tree.phase = "init";
-				self.append(data);
+//				self.append(data);
+				self.addChild(data, null);
 				self.tree.phase = "postInit";
 				self.setLazyNodeStatus(DTNodeStatus_Ok);
 				if( orgSuccess )
@@ -1281,14 +1345,14 @@ var DynaTree = Class.create();
 
 // --- Static members ----------------------------------------------------------
 
-DynaTree.version = "$Version: 0.5.0$"; 
-
+DynaTree.version = "$Version: 0.5.1$"; 
+/*
 DynaTree._initTree = function() {
 };
 
 DynaTree._bind = function() {
 };
-
+*/
 //--- Class members ------------------------------------------------------------
 
 DynaTree.prototype = {
@@ -1384,6 +1448,37 @@ DynaTree.prototype = {
 		this.logDebug("dynatree.redraw() done.");
 	},
 
+	reloadAjax: function() {
+		// Reload 
+		var opts = this.options;
+		if( ! opts.initAjax || ! opts.initAjax.url )
+			throw "tree.reload() requires 'initAjax' mode.";
+		var pers = this.persistence;
+		var ajaxOpts = $.extend({}, opts.initAjax);
+		// Append cookie info to the request
+		if( ajaxOpts.addActiveKey )
+			ajaxOpts.data.activeKey = pers.activeKey; 
+		if( ajaxOpts.addFocusedKey )
+			ajaxOpts.data.focusedKey = pers.focusedKey; 
+		if( ajaxOpts.addExpandedKeyList )
+			ajaxOpts.data.expandedKeyList = pers.expandedKeyList.join(","); 
+		if( ajaxOpts.addSelectedKeyList )
+			ajaxOpts.data.selectedKeyList = pers.selectedKeyList.join(","); 
+
+		// Setup onPostInit callback to be called when Ajax returns
+		if( opts.onPostInit ) {
+			if( ajaxOpts.success )
+				this.tree.logWarning("initAjax: success callback is ignored when onPostInit was specified.");
+			if( ajaxOpts.error )
+				this.tree.logWarning("initAjax: error callback is ignored when onPostInit was specified.");
+			var isReloading = pers.isReloading();
+			ajaxOpts["success"] = function(dtnode) { opts.onPostInit.call(dtnode.tree, isReloading, false); }; 
+			ajaxOpts["error"] = function(dtnode) { opts.onPostInit.call(dtnode.tree, isReloading, true); }; 
+		}
+    	this.logDebug("Dynatree._init(): send Ajax request...");
+    	this.tnRoot.appendAjax(ajaxOpts);
+	},
+
 	getRoot: function() {
 		return this.tnRoot;
 	},
@@ -1493,7 +1588,7 @@ TODO: better?
 				data.tooltip = $li.attr("title");
 			if( $li.attr("id") )
 				data.key = $li.attr("id");
-			// If a data attribute is present, evaluate as a javascript object
+			// If a data attribute is present, evaluate as a JavaScript object
 			if( $li.attr("data") ) {
 				var dataAttr = $.trim($li.attr("data"));
 				if( dataAttr ) {
@@ -1542,6 +1637,11 @@ $.widget("ui.dynatree", {
 
     	var $this = this.element;
     	var opts = this.options;
+    	// If a 'options.classNames' dictionary was passed, still use defaults 
+    	// for undefined classes:
+    	if( opts.classNames !== $.ui.dynatree.defaults.classNames ) {
+    		opts.classNames = $.extend({}, $.ui.dynatree.defaults.classNames, opts.classNames);
+    	}
 
     	// Guess skin path, if not specified
     	if(!opts.imagePath) {
@@ -1579,33 +1679,12 @@ $.widget("ui.dynatree", {
     	// Init tree structure
     	if( opts.children ) {
     		// Read structure from node array
-    		root.append(opts.children);
+    		root.addChild(opts.children);
 
     	} else if( opts.initAjax && opts.initAjax.url ) {
     		// Init tree from AJAX request
     		isLazy = true;
-    		var ajaxOpts = $.extend({}, opts.initAjax);
-    		// Append cookie info to the request
-    		if( ajaxOpts.addActiveKey )
-    			ajaxOpts.data.activeKey = this.tree.persistence.activeKey; 
-    		if( ajaxOpts.addFocusedKey )
-    			ajaxOpts.data.focusedKey = this.tree.persistence.focusedKey; 
-    		if( ajaxOpts.addExpandedKeyList )
-    			ajaxOpts.data.expandedKeyList = this.tree.persistence.expandedKeyList.join(","); 
-    		if( ajaxOpts.addSelectedKeyList )
-    			ajaxOpts.data.selectedKeyList = this.tree.persistence.selectedKeyList.join(","); 
-
-    		// Setup onPostInit callback to be called when Ajax returns
-    		if( opts.onPostInit ) {
-    			if( ajaxOpts.success )
-    				this.tree.logWarning("initAjax: success callback is ignored when onPostInit was specified.");
-    			if( ajaxOpts.error )
-    				this.tree.logWarning("initAjax: error callback is ignored when onPostInit was specified.");
-    			ajaxOpts["success"] = function(dtnode) { opts.onPostInit.call(dtnode.tree, isReloading, false); }; 
-    			ajaxOpts["error"] = function(dtnode) { opts.onPostInit.call(dtnode.tree, isReloading, true); }; 
-    		}
-        	this.tree.logDebug("Dynatree._init(): send Ajax request...");
-    		root.appendAjax(ajaxOpts);
+    		this.tree.reloadAjax();
 
     	} else if( opts.initId ) {
     		// Init tree from another UL element
@@ -1828,7 +1907,9 @@ $.ui.dynatree.defaults = {
 //		domain: "jquery.com",
 //		secure: true
 	},
-    
+    // Class names used, when rendering the HTML markup.
+	// Note: if only single entries are passed for options.classNames, all other 
+	// values are still set to default. 
 	classNames: {
 		container: "ui-dynatree-container",
 		folder: "ui-dynatree-folder",
@@ -1848,7 +1929,7 @@ $.ui.dynatree.defaults = {
 		combinedExpanderPrefix: "ui-dynatree-exp-",
 		combinedIconPrefix: "ui-dynatree-ico-",
 //		disabled: "ui-dynatree-disabled",
-//		hasChildren: "ui-dynatree-has-children",
+		hasChildren: "ui-dynatree-has-children",
 		active: "ui-dynatree-active",
 		selected: "ui-dynatree-selected",
 		expanded: "ui-dynatree-expanded",
@@ -1878,9 +1959,9 @@ $.ui.dynatree.nodedatadefaults = {
 	focus: false, // Initial focused status.
 	expand: false, // Initial expanded status.
 	select: false, // Initial selected status.
-//	hideCheckbox: null, // Suppress checkbox for this node.
-//	unselectable: false, // Prevent selection.
-//  disabled: null,	
+	hideCheckbox: false, // Suppress checkbox display for this node.
+	unselectable: false, // Prevent selection.
+//  disabled: false,	
 	// The following attributes are only valid if passed to some functions:
 	children: null, // Array of child nodes.
 	// NOTE: we can also add custom attributes here.